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

jyy

2021-04-09 f96ad6ec73b3da7df5c08471f0d567d46fc767e8

 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);