Merge remote-tracking branch 'origin/master'

hjl

2024-07-02 01dc732d940e81b954685705c32a129473eed951

 ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/TOrder.java

@@ -103,6 +103,13 @@
    @ApiModelProperty(value = "收货人地址")
    private String consigneeAddress;

    @ApiModelProperty(value = "收货地址 所属省")
    @TableField("province")
    private String province;
    @ApiModelProperty(value = "收货地址  所属市")
    @TableField("city")
    private String city;

    @ApiModelProperty(value = "订单备注")
    @TableField("remark")
    private String remark;