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

zjj

2025-07-22 fa3e00c4d5e91613e3f2a1f2692cb68635d4ad2d

 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;