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

xuhy

5 天以前 d90ac211d9168c1ce8d390838f367a0db00afb52

 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;