diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java index dddcf307c..26f79ac01 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java @@ -156,11 +156,11 @@ public class EmisWaybill extends BaseEntity private String sendPcd; /* 支付方式 : 现金或月结 */ @TableField - @DataAuditField(fieldComment = "支付方式") + @DataAuditField(fieldComment = "支付方式",dictType="emis_payment_type") private String paymentType; /* 计费方式 1-按重量 2-按体积 3-一口价 */ @TableField - @DataAuditField(fieldComment = "计费方式") + @DataAuditField(fieldComment = "计费方式",dictType="emis_calc_fee_type") private String calcFeeType; /* 支付月结编号 */ @TableField @@ -186,11 +186,11 @@ public class EmisWaybill extends BaseEntity private String carryType; /* 清关方式 */ @TableField - @DataAuditField(fieldComment = "清关方式") + @DataAuditField(fieldComment = "清关方式",dictType="emis_customs_clear") private String customsClear; /* 报关方式 */ @TableField - @DataAuditField(fieldComment = "报关方式") + @DataAuditField(fieldComment = "报关方式",dictType="emis_declare_mode") private String customsEclaration; /* 预计到达时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") @@ -199,15 +199,15 @@ public class EmisWaybill extends BaseEntity private Date estimateDate; /* 包装类型 */ @TableField - @DataAuditField(fieldComment = "包装类型") + @DataAuditField(fieldComment = "包装类型",dictType="emis_tab_packing_type") private String packType; /* 派件方式:1-派送 2-自提 */ @TableField - @DataAuditField(fieldComment = "派件方式") + @DataAuditField(fieldComment = "派件方式",dictType="emis_dispatch_method") private String dispatchMethod; /* 取件方式:1-上门取件 2-仓库收货 3-整柜提货 */ @TableField - @DataAuditField(fieldComment = "取件方式") + @DataAuditField(fieldComment = "取件方式",dictType="emis_qujian_fangshi") private String pickupMethod; /* 预计上门取件开始时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")