From 46273325d31a2219225bac5201db21b142ada1fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 13 Mar 2020 11:38:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=9F=A5=E8=AF=A2=EF=BC=9A?= =?UTF-8?q?=E6=96=B0=E5=A2=9EisQuery=E5=AD=97=E6=AE=B5=E7=94=A8=E4=BA=8E?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E6=98=AF=E5=90=A6=E5=8F=AF=E4=BD=9C=E4=B8=BA?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=88BUG#7675=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java index 954b670..cd04561 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java @@ -26,6 +26,8 @@ public @interface DynamicField { // 是否标题字段加粗 是否加粗:默认1-加粗，2-非加粗 int isWider() default 2; // 是否可选作查询条件:默认1-可选，2-不可选 + int isQuery() default 1; + // 是否勾选:默认1-勾选，2-非勾选 int isSelect() default 1; // 是否必选:默认1-必选，2-非必选 int isRequire() default 1; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 3e7e597..249411a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -65,7 +65,7 @@ public abstract class BaseBean implements Serializable { @Column(name="ORGANIZE_CODE", nullable = false) @ApiParam(value ="组织代码") // @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT,isSelect = 2, isRequire = 2) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT,isQuery = 2, isRequire = 2) public String organizeCode; @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false)