Merge branch 'dev' into test

6 years ago · 56407df957
parent 4ba25643d4 65cb39d7ba
commit 56407df957
2 changed files with 2 additions and 2 deletions
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java
@ -41,7 +41,7 @@ public class MesPcn extends BaseBean {

    @Column(name="WORK_CENTER_CODE")
    @ApiParam("工作中心")
-    private String workCentreCode;
+    private String workCenterCode;

    @Column(name="PCN_VERSION")
    @ApiParam("PCN版本")
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java
@ -41,7 +41,7 @@ public class MesPcn extends BaseBean {

    @Column(name="WORK_CENTER_CODE")
    @ApiParam("工作中心")
-    private String workCentreCode;
+    private String workCenterCode;

    @Column(name="PCN_VERSION")
    @ApiParam("PCN版本")