diff --git a/db/22年12月变更.sql b/db/22年12月变更.sql index 94402205..2759348e 100644 --- a/db/22年12月变更.sql +++ b/db/22年12月变更.sql @@ -1,10 +1,6 @@ ALTER TABLE `tb_certificate_payment` - ADD COLUMN `post_contact_name` varchar(100) NULL DEFAULT NULL COMMENT '邮寄联系人姓名' , - ADD COLUMN `post_contact_phone` varchar(100) NULL DEFAULT NULL COMMENT '邮寄联系人电话' , - ADD COLUMN `post_contact_address` varchar(150) NULL DEFAULT NULL COMMENT '邮寄联系人地址' , - ADD COLUMN `post_code` varchar(50) NULL DEFAULT NULL COMMENT '邮编' ; + ADD COLUMN `post_company_id` varchar(100) NULL COMMENT '邮寄企业id', + ADD COLUMN `post_contact_id` varchar(100) NULL COMMENT '邮寄联系人id'; ALTER TABLE `tb_member_project_subitem` - ADD COLUMN `post_contact_name` varchar(100) NULL DEFAULT NULL COMMENT '邮寄联系人姓名' , - ADD COLUMN `post_contact_phone` varchar(100) NULL DEFAULT NULL COMMENT '邮寄联系人电话' , - ADD COLUMN `post_contact_address` varchar(150) NULL DEFAULT NULL COMMENT '邮寄联系人地址' , - ADD COLUMN `post_code` varchar(50) NULL DEFAULT NULL COMMENT '邮编' ; \ No newline at end of file + ADD COLUMN `post_company_id` varchar(100) NULL COMMENT '邮寄企业id', + ADD COLUMN `post_contact_id` varchar(100) NULL COMMENT '邮寄联系人id'; \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java index c20b8e5c..2bcb6538 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java @@ -351,4 +351,30 @@ public class PayMemberProjectSubitem implements Serializable { @ApiModelProperty(value = "未税金额") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal noTaxAmount; + + @ApiModelProperty(value = "邮寄企业id") + private String postCompanyId; + + @ApiModelProperty(value = "邮寄企业名称") + @TableField(exist = false) + private String postCompanyName; + + //@ApiModelProperty(value = "邮寄联系人id") + //private String postContactId; + // + //@ApiModelProperty(value = "邮寄联系人姓名") + //@TableField(exist = false) + //private String postContactName; + + @ApiModelProperty(value = "邮寄联系人手机号") + @TableField(exist = false) + private String postContactPhone; + + @ApiModelProperty(value = "邮寄联系人地址") + @TableField(exist = false) + private String postContactAddress; + + @ApiModelProperty(value = "邮寄联系人邮编") + @TableField(exist = false) + private String contactPostCode; }