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/WaterResourceController.java

@@ -136,6 +136,8 @@ public class WaterResourceController extends BaseController {
                                                                             @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
         // 更新基本信息
         model.setSequenceNbr(sequenceNbr);
+        model.setRealityImg(JSONArray.toJSONString(model.getRealityImgList()));
+        model.setOrientationImg(JSONArray.toJSONString(model.getOrientationImgList()));
         WaterResourceDto waterResourceDto = waterResourceServiceImpl.updateWithModel(model);
         // 更新属性信息
         String resourceType = model.getResourceType();

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/utils/BeanDtoVoUtils.java

@@ -111,7 +111,7 @@ public class BeanDtoVoUtils {
             }
         });
     }
-    
+
     // 根据LocalDate来计算年龄
     public static int getAge(Date birthDay) {
         if (birthDay == null) {