Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion

野心家

2025-01-08 c688ad2d55d6a5355e0e75402177f3e7989600bc

 src/main/java/com/zy/asrs/entity/Order.java

@@ -170,9 +170,9 @@
    private Integer accountDay;

    /**
     * 邮费支付类型 1: 在线支付  2: 货到付款
     * ERP下推ID
     */
    @ApiModelProperty(value= "邮费支付类型 1: 在线支付  2: 货到付款  ")
    @ApiModelProperty(value= "ERP下推ID")
    @TableField("post_fee_type")
    private Integer postFeeType;