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

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppShareholderDetailBiz.java

@@ -192,6 +192,7 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
                 //更新股东表 持股状态改为已退股
                 mapper.updShareHolderIsQuit(appShareholderDetailDTO.getPhone(), companyId, 1);
                 AppShareholderDetail updAppShareholderDetail = selectById(appShareholderDetailDTO);
+                updAppShareholderDetail.setRelTime(appShareholderDetailDTO.getRelTime());
                 //查询股东表，是否为总部股东
                 Integer oldPositionId = null;
                 oldPositionId = mapper.selectShareHolderByUserIdOrPhone(updAppShareholderDetail.getUserId(), updAppShareholderDetail.getPhone());
@@ -256,6 +257,7 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
                 //修改
                 mapper.updShareHolderIsQuit(appShareholderDetailDTO.getPhone(), companyId, 0);
                 //updateSelectiveById(appShareholderDetail);
+                updAppShareholderDetail.setRelTime(appShareholderDetailDTO.getRelTime());
                 appShareholderDetailChangeRecordBiz.addAppShareholderDetailChangeRecord(updAppShareholderDetail, updUserId, SHAREHOLDERDE_IS_TRUE);
             }
         }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleWarningMsgBiz.java

@@ -103,6 +103,9 @@ public class VehicleWarningMsgBiz extends BaseBiz<VehicleWarningMsgMapper, Vehic
      */
     public RestResponse<PageDataVO<VehicleWarningMsg>> getByPage(String queryVehicleWarningMsgVoJson){
         try {
+            if (StringUtils.isBlank(queryVehicleWarningMsgVoJson)) {
+                return RestResponse.codeAndMessage(ResCode.INVALID_REST_REQ_PARAM.getCode(), ResCode.INVALID_REST_REQ_PARAM.getDesc());
+            }
             QueryVehicleWarningMsgVo queryVehicleWarningMsgVo = JSON.parseObject(queryVehicleWarningMsgVoJson, QueryVehicleWarningMsgVo.class);
             PageHelper.startPage(queryVehicleWarningMsgVo.getPage(),queryVehicleWarningMsgVo.getLimit());
             UserDTO userDTO = getAdminUserInfo();