Merge remote-tracking branch 'origin/master'

jiangping

2024-07-24 af9f7ad7d711f0562e4394449a117da20f808fc2

 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;

}