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

jyy

2021-01-16 522f32b832e47a1e0cb01b0b495d16ada34366a6

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