Merge branch 'developer' into hive2.0

Helius

2022-05-27 4351e71d782741143a98f86f6648acd16689165f

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

@@ -31,6 +31,7 @@
   
   public SysShopInfo  selectById(Long id);
   

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

   public List<SysShopInfo> selectShopInfo(Long companyId);