Merge branch 'TEST' into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertFormValue.java

@@ -62,7 +62,7 @@ public class AlertFormValue extends BaseEntity {
         this.block = block;
     }
     
-    public AlertFormValue(Long alertFormId, String fieldName, String fieldCode, boolean isBlock, String alertTypeCode) {
+    public AlertFormValue(Long alertFormId, String fieldName, String fieldCode, boolean block, String alertTypeCode) {
         this.alertFormId = alertFormId;
         this.fieldName = fieldName;
         this.fieldCode = fieldCode;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/AlertFormValueVo.java

@@ -45,7 +45,7 @@ public class AlertFormValueVo{
     private String recUserName;
 
     @ApiModelProperty(value = "是否一行显示")
-    private Boolean isBlock;
+    private Boolean block;
     
     @ApiModelProperty(value = "表单类型")
     private String fieldType;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertFormValueMapper.xml

@@ -15,7 +15,7 @@
 			v.rec_user_id recUserId,
 			v.rec_date recDate,
 			v.is_delete isDelete,
-			v.is_block isBlock,
+			v.block block,
 			f.field_type fieldType
 		FROM
 			jc_alert_form_value v

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

@@ -298,11 +298,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         for (AlertFormValueVo alertFormValue : list) {
             if (alertFormValue.getFieldValueCode() == null) {
                 FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), alertFormValue.getFieldType(),
-                        alertFormValue.getFieldValue(), alertFormValue.getIsBlock());
+                        alertFormValue.getFieldValue(), alertFormValue.getBlock());
                 formValue.add(value);
             } else {
                 FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), alertFormValue.getFieldType(),
-                        alertFormValue.getFieldValueCode(), alertFormValue.getIsBlock());
+                        alertFormValue.getFieldValueCode(), alertFormValue.getBlock());
                 formValue.add(value);
             }
         }
@@ -315,7 +315,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         List<FormValue> formValue = new ArrayList<>();
         for (AlertFormValueVo alertFormValue : list) {
             FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), alertFormValue.getFieldType(),
-                    alertFormValue.getFieldValue(), alertFormValue.getIsBlock());
+                    alertFormValue.getFieldValue(), alertFormValue.getBlock());
             formValue.add(value);
         }
         return formValue;