diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsDeclarationRecordsQueryVo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsDeclarationRecordsQueryVo.java index f8104b5..44824e4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsDeclarationRecordsQueryVo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsDeclarationRecordsQueryVo.java @@ -53,9 +53,9 @@ public class BmsDeclarationRecordsQueryVo implements Serializable { @Excel(name = "年份") private String year; - @ApiModelProperty(value = "申报类型 0:/, 1:试点区域,2:龙头型,3:创新型") - @Excel(name = "申报类型", readConverterExp = "0=/,1=试点区域,2=龙头型,3=创新型") - private Long type; +// @ApiModelProperty(value = "申报类型 0:/, 1:试点区域,2:龙头型,3:创新型") +// @Excel(name = "申报类型", readConverterExp = "0=/,1=试点区域,2=龙头型,3=创新型") +// private Long type; @ApiModelProperty(value = "申报途径 0:系统申报;1:补录") @Excel(name = "申报途径", readConverterExp = "0=系统申报,1=补录") diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml index e53f4f2..fd2e43d 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml @@ -233,7 +233,6 @@ b.id as enterpriseId, c.LEVEL, a.YEAR, - c.type, a.template_record_id, a.template_id, c.responsibility_unit,