Commit ac232969 authored by zhangjianqian's avatar zhangjianqian

修改导出字段

parent d416faaa
...@@ -65,7 +65,7 @@ public class TUser extends BaseEntity ...@@ -65,7 +65,7 @@ public class TUser extends BaseEntity
private String idcard; private String idcard;
//身份证 //身份证
@Excel(name = "营业网点") @Excel(name = "营业网点", dictType = "t_branch")
private String branch; private String branch;
...@@ -91,7 +91,7 @@ public class TUser extends BaseEntity ...@@ -91,7 +91,7 @@ public class TUser extends BaseEntity
private Integer meterType; private Integer meterType;
/** 表具厂家1金卡2秦川 */ /** 表具厂家1金卡2秦川 */
@Excel(name = "表具厂家1金卡2秦川") @Excel(name = "表具厂家" ,dictType = "t_meter_company" )
private Integer meterCompany; private Integer meterCompany;
/** 表具型号1 G1.5、2 G2.5、3 G4 */ /** 表具型号1 G1.5、2 G2.5、3 G4 */
......
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
v-for="dict in sceneOptions" v-for="dict in sceneOptions"
:key="dict.dictValue" :key="dict.dictValue"
:label="dict.dictLabel" :label="dict.dictLabel"
:value="parseInt(dict.dictValue)" :value="dict.dictValue"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment