Merge branch 'test6.9.23' into test6.9.24

@@ -65,10 +65,28 @@ public class AppEntranceIconController {
             logger.warn("updateById ,id is null");
             throw new com.yoho.error.exception.ServiceException(404, "id不能为空");
         }
+
+        // 重置请求参数
+        resetAppEntranceReq(entranceIconReq);
+
         appEntranceIconService.updateById(entranceIconReq);
         return new ApiResponse.ApiResponseBuilder().code(200).message("修改成功").build();
     }
 
+    private void resetAppEntranceReq(AppEntranceIconReq entranceIconReq) {
+        if (entranceIconReq.getIosBigImageFirst() == null){
+            entranceIconReq.setIosBigImageFirst("");
+        }
+
+        if (entranceIconReq.getIosSmallImageFirst() == null){
+            entranceIconReq.setIosSmallImageFirst("");
+        }
+
+        if (entranceIconReq.getAndroidImageFirst() == null){
+            entranceIconReq.setAndroidImageFirst("");
+        }
+    }
+
     @RequestMapping("/queryById")
     @ResponseBody
     public ApiResponse queryById(@RequestBody AppEntranceIconReq entranceIconReq){