diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BKeyEnterprise.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BKeyEnterprise.java index dd5816b..1c3e5b8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BKeyEnterprise.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BKeyEnterprise.java @@ -40,12 +40,6 @@ public class BKeyEnterprise implements Serializable { @ApiModelProperty(value = "企业代码") private String entCode; - /** - * 大类 - */ - @ApiModelProperty(value = "大类") - @Excel(name = "大类") - private String type; /** * 年份 @@ -116,12 +110,6 @@ public class BKeyEnterprise implements Serializable { @Excel(name = "企业名称") private String enterpriseName; - /** - * 企业名称 - */ - @ApiModelProperty(value = "区划代码") - @Excel(name = "区划代码") - private String district; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BKeyEnterprisePageRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BKeyEnterprisePageRequest.java index 071287e..640d7d5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BKeyEnterprisePageRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BKeyEnterprisePageRequest.java @@ -35,8 +35,8 @@ public class BKeyEnterprisePageRequest implements Serializable { /** * 年份 */ - @ApiModelProperty("区划代码") - private String district; + @ApiModelProperty("企业名称") + private String enterpriseName; /** * size diff --git a/ruoyi-system/src/main/resources/mapper/yingji/BKeyEnterpriseMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/BKeyEnterpriseMapper.xml index 6ddffcf..6143bcb 100644 --- a/ruoyi-system/src/main/resources/mapper/yingji/BKeyEnterpriseMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/yingji/BKeyEnterpriseMapper.xml @@ -10,21 +10,17 @@ ent_code, year, - type, enterprise_name, - district, #{entCode}, #{year}, - #{type}, #{enterpriseName}, - #{district},