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

无关风月

2025-06-25 3044a637a15e09d50ad733fd482c6e64e90df2f9

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java

@@ -34,6 +34,9 @@
    @ApiModelProperty("下单城市")
    @TableField("city")
    private String city;
    @ApiModelProperty("师傅填写备注")
    @TableField("remark")
    private String remark;
    @TableField("province_code")
    private String provinceCode;
    @TableField("are_code")