From 7755034dc8c59f0830af5dba42187dbf95fc2603 Mon Sep 17 00:00:00 2001 From: nies Date: Sun, 27 Jun 2021 18:06:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9SyslogRoleChange=20curren?= =?UTF-8?q?tRoles=20=E5=AD=97=E6=AE=B5=E4=B8=BATEXT=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java index 9fd30fc..b601377 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java @@ -46,7 +46,7 @@ public class SysLogRoleChange extends BaseBean { @ApiModelProperty(value = "之前的角色", access = "之前的角色") private String previousRoles; - @Column(name = "CURRENT_ROLES") + @Column(name = "CURRENT_ROLES", columnDefinition = "TEXT") @ApiModelProperty(value = "当前的角色", access = "当前的角色") private String currentRoles; From e0277363645a08019518a8635fd9e748e4a50a78 Mon Sep 17 00:00:00 2001 From: gsz Date: Mon, 28 Jun 2021 09:31:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?16409=2020063-PDA=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E9=A2=86=E6=96=99=E4=BB=BB=E5=8A=A1-=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=AD=90=E9=9B=B6=E4=BB=B6=E5=92=8C=E6=9B=BF?= =?UTF-8?q?=E4=BB=A3=E6=96=99=E7=BB=B4=E6=8A=A4=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 9f83850..59aa838 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -257,6 +257,15 @@ public class WmsMoveToERP extends BaseBean { @Transient private Double transQtySum; + @Transient + private Integer totalNum; + + @Transient + private Integer successNum; + + @Transient + private Integer falseNum; + public Double getTransQtySumVal() { return this.transQtySum == null ? 0 : this.transQtySum.doubleValue(); }