diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWljg.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWljg.java index b63d285b..c9a0e85f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWljg.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWljg.java @@ -39,7 +39,7 @@ public class TcWljg extends BaseEntity { * 1.启用 2.禁用 */ @ApiModelProperty(value = "1.启用 2.禁用") - @Excel(name = "1.启用 2.禁用") + @Excel(name = "启用/禁用") private Long isStatus; /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqzs.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqzs.java index 0aa02794..8a8aba37 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqzs.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqzs.java @@ -28,7 +28,8 @@ public class TcYqzs extends BaseEntity private Long id; /** 区域id */ - @Excel(name = "区域id",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城") + //,readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城" + @Excel(name = "区域id") @ApiModelProperty(value = "区域id,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城") private Long areaId;