Merge branch 'developer'

935090232@qq.com

2022-05-03 afe54403db87c5f04e841350c9312367e10de50f

 zq-erp/src/main/java/com/matrix/system/hive/dao/SysShopInfoDao.java

@@ -30,7 +30,8 @@
   public int  selectTotalRecord(@Param("record") SysShopInfo sysShopInfo);
   
   public SysShopInfo  selectById(Long id);
	


   public SysShopInfo selectByShopName(@Param("shopName") String shopName);

   public List<SysShopInfo> selectShopInfo(Long companyId);