Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

 Conflicts:

	modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java

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",columnDefinition = "TEXT")
+    @Column(name = "CURRENT_ROLES", columnDefinition = "TEXT")
     @ApiModelProperty(value = "当前的角色", access = "当前的角色")
     private String currentRoles;
 

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();
     }