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

huliguo

5 天以前 31737adbd155f37bd5d523f93dbaf44edcf27de5

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java

@@ -114,7 +114,7 @@
        one.setCreateTime(LocalDateTime.now());
        shopAppointableTimeService.save(one);
        //发送短信给商家
        String msg = "{\"name\":\"\"}";
        String msg = "{\"time\":\"" + dto.getTime() + "\"}";
        try {
            MsgUtils.sendMsg(shop.getShopownerPhone(), "SMS_491310429", msg);
        } catch (Exception e) {