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

xuhy

7 天以前 d90ac211d9168c1ce8d390838f367a0db00afb52

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

@@ -27,7 +27,9 @@

    @TableId("id")
    private Integer id;

    @ApiModelProperty("师傅填写备注")
    @TableField("remark")
    private String remark;
    @ApiModelProperty("下单城市")
    @TableField("city")
    private String city;