Jenkins自动合并

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

@@ -31,11 +31,11 @@ public class WmsLocatePart extends BaseBean {
 
     private static final long serialVersionUID = 9134745988014340144L;
     @Column(name = "LOCATE_NO")
-    @ApiParam(value = "库位代码")
+    @ApiParam(value = "库位编码")
     private String locateNo;
 
     @Column(name = "PART_NO")
-    @ApiParam(value = "物料编码")
+    @ApiParam(value = "物料代码")
     private String partNo;
 
     @Column(name = "PART_NAME_RDD")