Merge branch 'score_shop' into api_score_meger

wzy

2021-09-04 1a9b054b95eb864d1ae7d90d1dfbb497ca1db62a

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

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

   public SysCompany selectForUpdate(Long comId);

   List<SysCompany> selectAll();
}