冲突

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

@@ -23,6 +23,9 @@ public class SessionUser implements Serializable {
     @ApiParam("用户ID")
     private Long userId;
 
+    @ApiParam("设备ID")
+    private String deviceId;
+
     @ApiParam("用户工号")
     private String userCode;
 

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

@@ -36,7 +36,7 @@ public class WmsPackSn extends BaseBean {
     @ApiParam(value = "物料编码")
     private String partNo;
 
-    @Column(name = "PART_NAME")
+    @Column(name = "PART_NAME_ADD")
     @ApiParam(value = "物料名称")
     private String partNameAdd;