diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderDetails.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderDetails.java index 7051b9d..7605fa4 100644 --- a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderDetails.java +++ b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderDetails.java @@ -49,7 +49,7 @@ public class OrderDetails extends BaseEntity private String duration; /** 发票类型 */ - @Excel(name = "发票类型") + @Excel(name = "发票类型 1-增值税普票 2-增值税专票") private String invoiceType; /** 项目说明 */ diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderInfo.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderInfo.java index 40ba093..00a26df 100644 --- a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderInfo.java +++ b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderInfo.java @@ -66,8 +66,8 @@ public class OrderInfo extends BaseEntity private String supplier; /** 订单状态(待确认,待上传合同,待发货,已退货,待收货,进行中,临期,超期,驳回,退租申请,续租申请,完结) */ - @Excel(name = "订单状态", readConverterExp = "待=确认,待上传合同,待发货,已退货,待收货,进行中,临期,超期,驳回,退租申请,续租申请,完结") - @ApiModelProperty(value = "订单状态") + @Excel(name = "订单状态", readConverterExp = "待确认,待上传合同,待发货,已退货,待收货,进行中,临期,超期,驳回,退租申请,续租申请,完结") + @ApiModelProperty(value = "订单状态, 参考数据字典") private String orderStatus; /** 下单用户id */ diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderInfoVo.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderInfoVo.java index 71ca330..b74cbb5 100644 --- a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderInfoVo.java +++ b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderInfoVo.java @@ -39,7 +39,7 @@ public class OrderInfoVo extends OrderInfo { private String address; @ApiModelProperty(value = "工期时长") private String duration; - @ApiModelProperty(value = "发票类型") + @ApiModelProperty(value = "发票类型 1-增值税普票 2-增值税专票") private String invoiceType; @ApiModelProperty(value = "项目说明") private String description;