Merge branch 'score_shop' into api_score_meger

jyy

2021-07-14 7c92603d6548e7405a298d3c4996942acd999376

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

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

   public SysCompany selectForUpdate(Long comId);

   List<SysCompany> selectAll();
}