Merge branch 'developer' into alpha

姜友瑶

2022-05-17 81e00cd2e26e387d8ab2077ccd982072d6eb865b

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