diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContracrList.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContracrList.java index 10e2107f..6bd01185 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContracrList.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContracrList.java @@ -33,7 +33,7 @@ public class PayMailContracrList { @Excel(name = "合同总金额", width = 15) @ApiModelProperty(value = "合同总金额") private java.lang.String contractAmount; - @Dict(dicCode ="mail_type" ) + @Dict(dicCode ="mail_send" ) @ApiModelProperty(value = "邮寄方式") private java.lang.String sendMethod; @ApiModelProperty(value = "邮寄单号") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContract.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContract.java index b0a0cec3..2e8cd0d8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContract.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContract.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.jero.common.aspect.annotation.Dict; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -53,10 +54,12 @@ public class PayMailContract implements Serializable { @ApiModelProperty(value = "合同id") private java.lang.String contractId; /**邮寄状态(0:未邮寄,1::已邮寄)*/ + @Dict(dicCode = "mail_type") @Excel(name = "邮寄状态(0:未邮寄,1::已邮寄)", width = 15) @ApiModelProperty(value = "邮寄状态(0:未邮寄,1::已邮寄)") private java.lang.Integer postStatus; /**快递公司(1:EMS,2:顺丰)*/ + @Dict(dicCode ="mail_send" ) @Excel(name = "快递公司(1:EMS,2:顺丰)", width = 15) @ApiModelProperty(value = "快递公司(1:EMS,2:顺丰)") private java.lang.Integer sendMethod; @@ -92,6 +95,7 @@ public class PayMailContract implements Serializable { @ApiModelProperty(value = "邮寄人(详情使用)") @TableField(exist = false) private String mailName; + @Dict(dicCode ="contract_type") @ApiModelProperty(value = "合同类型:1 支出合同,2 收入合同") private Integer contractType; }