Merge branch 'score_shop' into api_score_meger

jyy

2021-08-02 578e37543a5f552a3a8b071aa637cd27e68fad33

 zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/templateMsg/AppointmentSuccess.java

@@ -48,7 +48,7 @@
        SysShopInfo shopInfo = shopInfoDao.selectById(onlinebooking.getShopId());

        //获取模板id
        ShopWxtemplateMsg wxtemplateMsg = wxtemplateMsgDao.selectByCode(TemplateMsgType.APPOINTMENT_SUCCESS.getCode());
        ShopWxtemplateMsg wxtemplateMsg = wxtemplateMsgDao.selectByCode(TemplateMsgType.APPOINTMENT_SUCCESS.getCode(), 17L);


        String page = "pages/yuyue/yyInfo?id=" + orderId + "&model=1";