Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/ShCarController.java

@@ -172,7 +172,7 @@ public class ShCarController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "数据查询，校验是否是三环系统数据", notes = "数据查询，校验是否是三环系统数据")
     @GetMapping(value = "/searchForSanHanAllParams")
     public ResponseModel<ShCar> searchForSanHan(@ApiParam(name = "使用登记证编号") @RequestParam String useRegistrationCode,
-                                                @ApiParam(name = "车牌号") @RequestParam String carNumber,
+                                                @ApiParam(name = "车牌号") @RequestParam(value = "carNumber", required = false) String carNumber,
                                                 @ApiParam(name = "单位内编号") @RequestParam(value = "USE_INNER_CODE", required = false) String useInnerCode,
                                                 @ApiParam(name = "车辆VIN码") @RequestParam String identificationCode) {
         if (StringUtils.isEmpty(carNumber) && !StringUtils.isEmpty(useInnerCode)) {

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcOpeningApplicationServiceImpl.java

@@ -516,6 +516,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         userInfoQueryWrapper.eq(TzsUserInfo::getUnitCode, unitCode);
         commonService.castPersonType2Post(userInfoQueryWrapper, personType);
         userInfoQueryWrapper.eq(BaseEntity::getIsDelete, false);
+        userInfoQueryWrapper.orderByDesc(TzsUserInfo::getRecDate);
         List<TzsUserInfo> userInfos = userInfoMapper.selectList(userInfoQueryWrapper);
         String appKey = RequestContext.getAppKey();
         String product = RequestContext.getProduct();