Merge branch 'developer' into alpha

Helius

2022-03-10 6678c4c0f42d25e0a63416f4ac5dda3cd66627a7

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