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

935090232@qq.com

2021-11-21 b4fa5c2efd4f78f2623f4302509b12c98a73b339

 zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopWxtemplateMsgDao.java

@@ -26,7 +26,7 @@
   
   public int deleteById(Integer id);

   public ShopWxtemplateMsg selectByCode(Integer code);
   public ShopWxtemplateMsg selectByCode(@Param("code") Integer code, @Param("companyId") Long companyId);

   public int deleteByModel(@Param("record") ShopWxtemplateMsg shopWxtemplateMsg);