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

无关风月

3 天以前 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed

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

@@ -76,6 +76,12 @@
    @ApiModelProperty("城市编码")
    @TableField("city_code")
    private String cityCode;
    @TableField(exist = false)
    private String reservationName;
    @TableField(exist = false)
    private String reservationPhone;
    @TableField(exist = false)
    private String reservationAddress;


}