diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index 680116a..222f5fa 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -66,9 +66,8 @@ FROM ( SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS - "measurePeriod",valid_deadline AS validDeadline,measure_last_time AS - "measureLastTime",create_time,id,measure_content AS - "measureContent",customer_no AS "customerNo",power_voltage AS "powerVoltage" + "measurePeriod",valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,id, + measure_content AS "measureContent",customer_no AS "customerNo",power_voltage AS "powerVoltage",manufacturer AS "manufacturer" FROM customer_sample_info WHERE is_del=0 diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index 680116a..222f5fa 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -66,9 +66,8 @@ FROM ( SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS - "measurePeriod",valid_deadline AS validDeadline,measure_last_time AS - "measureLastTime",create_time,id,measure_content AS - "measureContent",customer_no AS "customerNo",power_voltage AS "powerVoltage" + "measurePeriod",valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,id, + measure_content AS "measureContent",customer_no AS "customerNo",power_voltage AS "powerVoltage",manufacturer AS "manufacturer" FROM customer_sample_info WHERE is_del=0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java index 80765bf..43d6f5c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java @@ -26,15 +26,16 @@ public class OrderListResponse { private final Long id; - @ApiModelProperty(value = "委托书编号", dataType = "String") - @ExcelProperty(value = "委托书编号",order = 0) + @ApiModelProperty(value = "委托单编号", dataType = "String") + @ExcelProperty(value = "委托单编号",order = 0) private String orderCode; - @ApiModelProperty(value = "委托书类型-字典code（1检测委托单，2检定或校准委托单）（检测委托单不出证书，检定或校准委托单出具证书）", dataType = "String") - @DictCodeField(message = "接收状态不合法", cacheName = MeterDictCode.ORDER_TYPE) + @ApiModelProperty(value = "委托单类型-字典code（1检测委托单，2检定或校准委托单）（检测委托单不出证书，检定或校准委托单出具证书）", dataType = "String") + @DictCodeField(message = "委托单类型不合法", cacheName = MeterDictCode.ORDER_TYPE) private String orderType; @ApiModelProperty(value = "委托书类型-字典value", dataType = "String") + @ExcelProperty(value = "委托单类型",order = 0) @TableField(exist = false) private String orderTypeName; @@ -42,8 +43,8 @@ // @ExcelProperty(value = "委托方id",order = 1) private String customerId; - @ApiModelProperty(value = "委托方编号", dataType = "String") - @ExcelProperty(value = "委托方编号",order = 1) + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 1) private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") @@ -60,16 +61,14 @@ @ApiModelProperty(value = "要求检完时间", dataType = "String") private String requireOverTime; - @ApiModelProperty(value = "送样人", dataType = "String") - @ExcelProperty(value = "送样人",order = 3) + @ApiModelProperty(value = "联系人", dataType = "String") + @ExcelProperty(value = "联系人",order = 3) private String deliverer; @ApiModelProperty(value = "送样人联系方式", dataType = "String") - @ExcelProperty(value = "送样人联系方式",order = 4) private String delivererTel; @ApiModelProperty(value = "联系方式-客户的固定电话", dataType = "String") - @ExcelProperty(value = "联系方式",order = 5) private String customerPhone; @ApiModelProperty(value = "预计送达时间", dataType = "String") @@ -77,11 +76,10 @@ @TableField(exist = false) @ApiModelProperty(value = "样品数量", dataType = "String") - @ExcelProperty(value = "样品数量",order = 6) + @ExcelProperty(value = "样品数量",order = 4) private Integer sampleCount; @ApiModelProperty(value = "是否加急", dataType = "String") - @ExcelProperty(value = "是否加急",order = 7) private String isUrgent; @ApiModelProperty(value = "接收状态（包括接收相关状态和检测完成状态）", dataType = "String") @@ -90,15 +88,14 @@ @TableField(exist = false) @ApiModelProperty(value = "接收状态名称", dataType = "String") - @ExcelProperty(value = "接收状态名称",order = 8) + @ExcelProperty(value = "接收状态",order = 5) private String statusName; @ApiModelProperty(value = "创建时间", dataType = "String") - @ExcelProperty(value = "创建时间",order = 9) + @ExcelProperty(value = "创建时间",order = 6) private String createTime; @ApiModelProperty(value = "备注", dataType = "String") - @ExcelProperty(value = "备注",order = 10) private String remark; @ApiModelProperty(value = "证书单位名称", dataType = "String") diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index 680116a..222f5fa 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -66,9 +66,8 @@ FROM ( SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS - "measurePeriod",valid_deadline AS validDeadline,measure_last_time AS - "measureLastTime",create_time,id,measure_content AS - "measureContent",customer_no AS "customerNo",power_voltage AS "powerVoltage" + "measurePeriod",valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,id, + measure_content AS "measureContent",customer_no AS "customerNo",power_voltage AS "powerVoltage",manufacturer AS "manufacturer" FROM customer_sample_info WHERE is_del=0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java index 80765bf..43d6f5c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java @@ -26,15 +26,16 @@ public class OrderListResponse { private final Long id; - @ApiModelProperty(value = "委托书编号", dataType = "String") - @ExcelProperty(value = "委托书编号",order = 0) + @ApiModelProperty(value = "委托单编号", dataType = "String") + @ExcelProperty(value = "委托单编号",order = 0) private String orderCode; - @ApiModelProperty(value = "委托书类型-字典code（1检测委托单，2检定或校准委托单）（检测委托单不出证书，检定或校准委托单出具证书）", dataType = "String") - @DictCodeField(message = "接收状态不合法", cacheName = MeterDictCode.ORDER_TYPE) + @ApiModelProperty(value = "委托单类型-字典code（1检测委托单，2检定或校准委托单）（检测委托单不出证书，检定或校准委托单出具证书）", dataType = "String") + @DictCodeField(message = "委托单类型不合法", cacheName = MeterDictCode.ORDER_TYPE) private String orderType; @ApiModelProperty(value = "委托书类型-字典value", dataType = "String") + @ExcelProperty(value = "委托单类型",order = 0) @TableField(exist = false) private String orderTypeName; @@ -42,8 +43,8 @@ // @ExcelProperty(value = "委托方id",order = 1) private String customerId; - @ApiModelProperty(value = "委托方编号", dataType = "String") - @ExcelProperty(value = "委托方编号",order = 1) + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 1) private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") @@ -60,16 +61,14 @@ @ApiModelProperty(value = "要求检完时间", dataType = "String") private String requireOverTime; - @ApiModelProperty(value = "送样人", dataType = "String") - @ExcelProperty(value = "送样人",order = 3) + @ApiModelProperty(value = "联系人", dataType = "String") + @ExcelProperty(value = "联系人",order = 3) private String deliverer; @ApiModelProperty(value = "送样人联系方式", dataType = "String") - @ExcelProperty(value = "送样人联系方式",order = 4) private String delivererTel; @ApiModelProperty(value = "联系方式-客户的固定电话", dataType = "String") - @ExcelProperty(value = "联系方式",order = 5) private String customerPhone; @ApiModelProperty(value = "预计送达时间", dataType = "String") @@ -77,11 +76,10 @@ @TableField(exist = false) @ApiModelProperty(value = "样品数量", dataType = "String") - @ExcelProperty(value = "样品数量",order = 6) + @ExcelProperty(value = "样品数量",order = 4) private Integer sampleCount; @ApiModelProperty(value = "是否加急", dataType = "String") - @ExcelProperty(value = "是否加急",order = 7) private String isUrgent; @ApiModelProperty(value = "接收状态（包括接收相关状态和检测完成状态）", dataType = "String") @@ -90,15 +88,14 @@ @TableField(exist = false) @ApiModelProperty(value = "接收状态名称", dataType = "String") - @ExcelProperty(value = "接收状态名称",order = 8) + @ExcelProperty(value = "接收状态",order = 5) private String statusName; @ApiModelProperty(value = "创建时间", dataType = "String") - @ExcelProperty(value = "创建时间",order = 9) + @ExcelProperty(value = "创建时间",order = 6) private String createTime; @ApiModelProperty(value = "备注", dataType = "String") - @ExcelProperty(value = "备注",order = 10) private String remark; @ApiModelProperty(value = "证书单位名称", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java index 7ce824f..5ce6b3e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java @@ -1,7 +1,5 @@ package com.casic.missiles.dto.customer.sample; -import com.casic.missiles.annotation.DictCodeField; -import com.casic.missiles.constants.MeterDictCode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,6 +38,9 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufacturingNo; + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + @ApiModelProperty(value = "附件说明", dataType = "String") private String appendixDescn; diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index 680116a..222f5fa 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -66,9 +66,8 @@ FROM ( SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS - "measurePeriod",valid_deadline AS validDeadline,measure_last_time AS - "measureLastTime",create_time,id,measure_content AS - "measureContent",customer_no AS "customerNo",power_voltage AS "powerVoltage" + "measurePeriod",valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,id, + measure_content AS "measureContent",customer_no AS "customerNo",power_voltage AS "powerVoltage",manufacturer AS "manufacturer" FROM customer_sample_info WHERE is_del=0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java index 80765bf..43d6f5c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java @@ -26,15 +26,16 @@ public class OrderListResponse { private final Long id; - @ApiModelProperty(value = "委托书编号", dataType = "String") - @ExcelProperty(value = "委托书编号",order = 0) + @ApiModelProperty(value = "委托单编号", dataType = "String") + @ExcelProperty(value = "委托单编号",order = 0) private String orderCode; - @ApiModelProperty(value = "委托书类型-字典code（1检测委托单，2检定或校准委托单）（检测委托单不出证书，检定或校准委托单出具证书）", dataType = "String") - @DictCodeField(message = "接收状态不合法", cacheName = MeterDictCode.ORDER_TYPE) + @ApiModelProperty(value = "委托单类型-字典code（1检测委托单，2检定或校准委托单）（检测委托单不出证书，检定或校准委托单出具证书）", dataType = "String") + @DictCodeField(message = "委托单类型不合法", cacheName = MeterDictCode.ORDER_TYPE) private String orderType; @ApiModelProperty(value = "委托书类型-字典value", dataType = "String") + @ExcelProperty(value = "委托单类型",order = 0) @TableField(exist = false) private String orderTypeName; @@ -42,8 +43,8 @@ // @ExcelProperty(value = "委托方id",order = 1) private String customerId; - @ApiModelProperty(value = "委托方编号", dataType = "String") - @ExcelProperty(value = "委托方编号",order = 1) + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 1) private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") @@ -60,16 +61,14 @@ @ApiModelProperty(value = "要求检完时间", dataType = "String") private String requireOverTime; - @ApiModelProperty(value = "送样人", dataType = "String") - @ExcelProperty(value = "送样人",order = 3) + @ApiModelProperty(value = "联系人", dataType = "String") + @ExcelProperty(value = "联系人",order = 3) private String deliverer; @ApiModelProperty(value = "送样人联系方式", dataType = "String") - @ExcelProperty(value = "送样人联系方式",order = 4) private String delivererTel; @ApiModelProperty(value = "联系方式-客户的固定电话", dataType = "String") - @ExcelProperty(value = "联系方式",order = 5) private String customerPhone; @ApiModelProperty(value = "预计送达时间", dataType = "String") @@ -77,11 +76,10 @@ @TableField(exist = false) @ApiModelProperty(value = "样品数量", dataType = "String") - @ExcelProperty(value = "样品数量",order = 6) + @ExcelProperty(value = "样品数量",order = 4) private Integer sampleCount; @ApiModelProperty(value = "是否加急", dataType = "String") - @ExcelProperty(value = "是否加急",order = 7) private String isUrgent; @ApiModelProperty(value = "接收状态（包括接收相关状态和检测完成状态）", dataType = "String") @@ -90,15 +88,14 @@ @TableField(exist = false) @ApiModelProperty(value = "接收状态名称", dataType = "String") - @ExcelProperty(value = "接收状态名称",order = 8) + @ExcelProperty(value = "接收状态",order = 5) private String statusName; @ApiModelProperty(value = "创建时间", dataType = "String") - @ExcelProperty(value = "创建时间",order = 9) + @ExcelProperty(value = "创建时间",order = 6) private String createTime; @ApiModelProperty(value = "备注", dataType = "String") - @ExcelProperty(value = "备注",order = 10) private String remark; @ApiModelProperty(value = "证书单位名称", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java index 7ce824f..5ce6b3e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java @@ -1,7 +1,5 @@ package com.casic.missiles.dto.customer.sample; -import com.casic.missiles.annotation.DictCodeField; -import com.casic.missiles.constants.MeterDictCode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,6 +38,9 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufacturingNo; + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + @ApiModelProperty(value = "附件说明", dataType = "String") private String appendixDescn; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java index a482c09..8a9039a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -1,12 +1,6 @@ package com.casic.missiles.model.customer; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.casic.missiles.annotation.DictCodeField; @@ -32,48 +26,62 @@ private String customerName; @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String briefName; @ApiModelProperty(value = "业务内容", dataType = "String") private String businessContent; @ApiModelProperty(value = "税号", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String taxNumber; @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String bankAccount; @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String bankName; @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String bankAccountNumber; @ApiModelProperty(value = "邮编", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String postalCode; @ApiModelProperty(value = "负责人", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String director; @ApiModelProperty(value = "电话", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String phone; @ApiModelProperty(value = "传真", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String fax; @ApiModelProperty(value = "手机", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String mobile; @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String email; @ApiModelProperty(value = "网址", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String website; @ApiModelProperty(value = "履约评级-字典", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String grade; @ApiModelProperty(value = "公司规模", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) private String companySize; @@ -82,6 +90,7 @@ private String companySizeName; @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) private String businessSize; @@ -90,6 +99,7 @@ private String businessSizeName; @ApiModelProperty(value = "整体评价", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) private String evaluation; @@ -98,66 +108,87 @@ private String evaluationName; @ApiModelProperty(value = "公司地址-国家", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String addressCountry; @ApiModelProperty(value = "公司地址-省", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String addressProvince; @ApiModelProperty(value = "公司地址-市", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String addressCity; @ApiModelProperty(value = "公司地址-区", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String addressArea; @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String fullAddress; @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String addressCountryName; @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String addressProvinceName; @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String addressCityName; @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String addressAreaName; @ApiModelProperty(value = "开票地址-国家", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String invoiceCountry; @ApiModelProperty(value = "开票地址-省", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String invoiceProvince; @ApiModelProperty(value = "开票地址-市", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String invoiceCity; @ApiModelProperty(value = "开票地址-区", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String invoiceArea; @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String invoiceFullAddress; @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String invoiceCountryName; @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String invoiceProvinceName; @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String invoiceCityName; @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String invoiceAreaName; @ApiModelProperty(value = "业务范围", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String businessScope; @ApiModelProperty(value = "minio存储文件名", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String minioFileName; @ApiModelProperty(value = "备注", dataType = "String") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String remark; @ApiModelProperty(value = "创建人", dataType = "Long")