修改字段

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

@@ -49,24 +49,24 @@ public class AlertFormValue extends BaseEntity {
     private String recUserName;
 
     @ApiModelProperty(value = "是否一行显示")
-    private Boolean isBlock;
+    private Boolean block;
 
 	public AlertFormValue() {
 		super();
 	}
 
-    public AlertFormValue(Long alertFormId, String fieldName, String fieldCode, boolean isBlock) {
+    public AlertFormValue(Long alertFormId, String fieldName, String fieldCode, boolean block) {
         this.alertFormId = alertFormId;
         this.fieldName = fieldName;
         this.fieldCode = fieldCode;
-        this.isBlock = isBlock;
+        this.block = block;
     }
     
     public AlertFormValue(Long alertFormId, String fieldName, String fieldCode, boolean isBlock, String alertTypeCode) {
         this.alertFormId = alertFormId;
         this.fieldName = fieldName;
         this.fieldCode = fieldCode;
-        this.isBlock = isBlock;
+        this.block = block;
         this.alertTypeCode = alertTypeCode;
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertCalledController.java

@@ -146,7 +146,7 @@ public class AlertCalledController extends BaseController {
              List<FormValue> formValue = new ArrayList<FormValue>();
              if(list!=null&&list.size()>0) {
 	        	 for (AlertFormValue alertFormValue : list) {
-	                 FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValue(),alertFormValue.getIsBlock());
+	                 FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValue(),alertFormValue.getBlock());
 	                 formValue.add(value);
 	             }
              }