Merge branch 'score_shop' into api_score_meger

jyy

2021-08-20 d5d3d4e6397f23782958748f46c389b85eaafe47

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

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

   public SysCompany selectForUpdate(Long comId);

   List<SysCompany> selectAll();
}