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

huliguo

2 天以前 c5d38d650d2ac4101b1293a4f17346e7d5420076

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopTotal.java

@@ -60,8 +60,8 @@
    /**
     * 总体验订单数
     */
    @TableField("tolta_experience_order")
    private Integer toltaExperienceOrder;
    @TableField("total_experience_order")
    private Integer totalExperienceOrder;
    /**
     * 总服务订单数
     */