Merge branch 'developer' into alpha

姜友瑶

2022-05-04 9fc4177dd26683f5dc6d8ebb62ab5b230ac21def

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