diff --git a/jnpf-java-boot/jnpf-permission/jnpf-permission-entity/src/main/java/jnpf/permission/model/organize/OrganizeCrModel.java b/jnpf-java-boot/jnpf-permission/jnpf-permission-entity/src/main/java/jnpf/permission/model/organize/OrganizeCrModel.java index b7e94cfa..52c10398 100644 --- a/jnpf-java-boot/jnpf-permission/jnpf-permission-entity/src/main/java/jnpf/permission/model/organize/OrganizeCrModel.java +++ b/jnpf-java-boot/jnpf-permission/jnpf-permission-entity/src/main/java/jnpf/permission/model/organize/OrganizeCrModel.java @@ -46,6 +46,6 @@ public class OrganizeCrModel { @Schema(description = "注册地址") private String registeredAddress; @Schema(description = "ERP编码") - private String ERPCode; + private String erpCode; } diff --git a/jnpf-java-boot/jnpf-permission/jnpf-permission-entity/src/main/java/jnpf/permission/model/organize/OrganizeDepartInfoVO.java b/jnpf-java-boot/jnpf-permission/jnpf-permission-entity/src/main/java/jnpf/permission/model/organize/OrganizeDepartInfoVO.java index dae7f607..af595d83 100644 --- a/jnpf-java-boot/jnpf-permission/jnpf-permission-entity/src/main/java/jnpf/permission/model/organize/OrganizeDepartInfoVO.java +++ b/jnpf-java-boot/jnpf-permission/jnpf-permission-entity/src/main/java/jnpf/permission/model/organize/OrganizeDepartInfoVO.java @@ -28,12 +28,12 @@ public class OrganizeDepartInfoVO { @Schema(description = "备注") private String description; @Schema(description = "主管id") - @JSONField(name = "manager") + @JSONField(name = "managerId") private String managerId; @Schema(description = "排序码") private Long sortCode; @Schema(description = "ERP编码") - private String ERPCode; + private String erpCode; @Schema(description = "组织id树") private List organizeIdTree; diff --git a/jnpf-java-boot/jnpf-permission/jnpf-permission-entity/src/main/java/jnpf/permission/model/organize/OrganizeInfoVO.java b/jnpf-java-boot/jnpf-permission/jnpf-permission-entity/src/main/java/jnpf/permission/model/organize/OrganizeInfoVO.java index b2f4b1bc..dc4ffaa4 100644 --- a/jnpf-java-boot/jnpf-permission/jnpf-permission-entity/src/main/java/jnpf/permission/model/organize/OrganizeInfoVO.java +++ b/jnpf-java-boot/jnpf-permission/jnpf-permission-entity/src/main/java/jnpf/permission/model/organize/OrganizeInfoVO.java @@ -32,7 +32,7 @@ public class OrganizeInfoVO extends PermissionVoBase { @Schema(description = "排序") private Long sortCode; @Schema(description = "ERP编码") - private String ERPCode; + private String erpCode; @Schema(description = "组织id树") private List organizeIdTree; diff --git a/jnpf-java-boot/jnpf-permission/jnpf-permission-entity/src/main/java/jnpf/permission/model/organize/OrganizeListVO.java b/jnpf-java-boot/jnpf-permission/jnpf-permission-entity/src/main/java/jnpf/permission/model/organize/OrganizeListVO.java index 75259d7e..752c0cdc 100644 --- a/jnpf-java-boot/jnpf-permission/jnpf-permission-entity/src/main/java/jnpf/permission/model/organize/OrganizeListVO.java +++ b/jnpf-java-boot/jnpf-permission/jnpf-permission-entity/src/main/java/jnpf/permission/model/organize/OrganizeListVO.java @@ -51,5 +51,5 @@ public class OrganizeListVO { @Schema(description ="组织id树") private List organizeIds; @Schema(description = "ERP编码") - private String ERPCode; + private String erpCode; } diff --git a/jnpf-java-boot/jnpf-permission/jnpf-permission-entity/src/main/java/jnpf/permission/model/organize/OrganizeModel.java b/jnpf-java-boot/jnpf-permission/jnpf-permission-entity/src/main/java/jnpf/permission/model/organize/OrganizeModel.java index 2dc8e566..deaedc41 100644 --- a/jnpf-java-boot/jnpf-permission/jnpf-permission-entity/src/main/java/jnpf/permission/model/organize/OrganizeModel.java +++ b/jnpf-java-boot/jnpf-permission/jnpf-permission-entity/src/main/java/jnpf/permission/model/organize/OrganizeModel.java @@ -28,5 +28,5 @@ public class OrganizeModel extends SumTree { private String lastFullName; @Schema(description = "ERP编码") - private String ERPCode; + private String erpCode; } diff --git a/jnpf-java-boot/jnpf-web/src/views/permission/organize/depForm.vue b/jnpf-java-boot/jnpf-web/src/views/permission/organize/depForm.vue index b3f209ad..c2c42b36 100644 --- a/jnpf-java-boot/jnpf-web/src/views/permission/organize/depForm.vue +++ b/jnpf-java-boot/jnpf-web/src/views/permission/organize/depForm.vue @@ -15,8 +15,8 @@ - - + + @@ -55,7 +55,7 @@ export default { sortCode: 0, enabledMark: 1, description: '', - ERPCode: '' + erpCode: '' }, organizeIdTree: [], dataRule: {