From af9f7ad7d711f0562e4394449a117da20f808fc2 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 24 七月 2024 16:44:40 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/service/src/main/java/com/doumee/dao/business/model/Customer.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Customer.java b/server/service/src/main/java/com/doumee/dao/business/model/Customer.java index 2fbe6c7..17fb7e8 100644 --- a/server/service/src/main/java/com/doumee/dao/business/model/Customer.java +++ b/server/service/src/main/java/com/doumee/dao/business/model/Customer.java @@ -94,6 +94,9 @@ @ExcelColumn(name="鍖哄煙") private String areaName; + @ApiModelProperty(value = "鍖哄煙缂栫爜") + @ExcelColumn(name="鍖哄煙缂栫爜") + private String areaCode; @ApiModelProperty(value = "绯荤粺鐗堟湰") @ExcelColumn(name="绯荤粺鐗堟湰") private String sysVersion; @@ -118,8 +121,5 @@ @ExcelColumn(name="鐪佷唤缂栫爜") private String provinceCode; - @ApiModelProperty(value = "鍖哄煙缂栫爜") - @ExcelColumn(name="鍖哄煙缂栫爜") - private String areaCode; } -- Gitblit v1.9.3