解决冲突

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

@@ -24,22 +24,22 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_MOVE_MASTER")
+@Table(name = "WMS_MOVE_MASTER")
 @Api("库存移动单主表信息")
 public class WmsMoveMaster extends BaseBean {
 
-    @Column(name="ORDER_NO")
+    @Column(name = "ORDER_NO")
     @ApiParam("单号")
     public String orderNo;
 
     /**
      * 状态:1=创建,10=待处理,20=已处理
      */
-    @Column(name="ORDER_STATUS")
+    @Column(name = "ORDER_STATUS")
     @ApiParam(value = "状态", example = "0")
     public Integer orderStatus;
 
-    @Column(name="REMARK")
+    @Column(name = "REMARK")
     @ApiParam("备注")
     public String reMark;