Merge branch 'developer'

姜友瑶

2022-06-26 c46272806303d309aadac6517417b4177eebca1f

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