解决冲突

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

@@ -52,6 +52,6 @@ public class WmsActionStepCall extends BaseBean {
     public transient String amDesc;
 
     @Column(name="AM_TYPE")
-    @ApiParam(value = "组件类型")
+    @ApiParam(value = "组件类型", example = "0")
-    public transient Integer amType;
+    public Integer amType;
 }