Merge branch 'score_shop' into api_score_meger

Helius

2022-01-04 342f8a021166f82a973d3cd3fc03841df502d26a

 zq-erp/src/main/java/com/matrix/system/common/dao/SysCompanyDao.java

@@ -40,4 +40,5 @@

   public SysCompany selectForUpdate(Long comId);

   List<SysCompany> selectAll();
}