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

无关风月

9 天以前 f135f2c8c08b16ac25a4e8e0398418ab3ce1e620

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

@@ -79,4 +79,11 @@
    @TableField("city_code")
    private String cityCode;

    @TableField(exist = false)
    private String reservationName;
    @TableField(exist = false)
    private String reservationPhone;
    @TableField(exist = false)
    private String reservationAddress;

}