Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java

@@ -37,7 +37,6 @@ public class BfIntercept extends BaseBean {
     // BlockFormEnumUtil.EXECUTION_TYPE
     @Column(name="EXECUTE_MODE")
     @ApiParam(value ="执行方式")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Integer executeMode;
 
     @Column(name="EXECUTE_CONTENT")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java

@@ -105,7 +105,7 @@ public class WmsPOMasterDetails extends BaseBean {
 
     @Column(name = "SNP")
     @ApiParam("标准包装")
-    public Integer snp;
+    public Double snp;
 
     /**
      * 是否免费:0=计费,1=免费