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

无关风月

3 天以前 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed

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

@@ -34,7 +34,9 @@
    @ApiModelProperty("下单城市")
    @TableField("city")
    private String city;

    @ApiModelProperty("师傅填写备注")
    @TableField("remark")
    private String remark;
    @TableField("province_code")
    private String provinceCode;