Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AircraftController.java

@@ -119,14 +119,14 @@ public class AircraftController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "航空器信息分页查询", notes = "航空器信息分页查询")
     public ResponseModel<Page<AircraftDto>> queryForPage(
             @RequestParam(value = "aircraftModel", required = false) String aircraftModel,
-            @RequestParam(value = "engineType", required = false) String engineType,
-            @RequestParam(value = "fuelType", required = false) String fuelType,
+            @RequestParam(value = "engineTypeCode", required = false) String engineTypeCode,
+            @RequestParam(value = "fuelTypeCode", required = false) String fuelTypeCode,
             @RequestParam(value = "current") int current,
             @RequestParam(value = "size") int size) {
         Page<AircraftDto> page = new Page<AircraftDto>();
         page.setCurrent(current);
         page.setSize(size);
         return ResponseHelper.buildResponse(aircraftServiceImpl.queryForAircraftPage(page, false, aircraftModel,
-                engineType, fuelType));
+                engineTypeCode, fuelTypeCode));
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AircraftServiceImpl.java

@@ -142,8 +142,8 @@ public class AircraftServiceImpl extends BaseService<AircraftDto, Aircraft, Airc
     public Page<AircraftDto> queryForAircraftPage(Page<AircraftDto> page,
                                                   Boolean isDelete,
                                                   @Condition(Operator.like) String aircraftModel,
-                                                  String engineType, String fuelType) {
-        return this.queryForPage(page, null, false, isDelete, aircraftModel, engineType, fuelType);
+                                                  String engineTypeCode, String fuelTypeCode) {
+        return this.queryForPage(page, null, false, isDelete, aircraftModel, engineTypeCode, fuelTypeCode);
     }
 
     /**