Merge branch 'score_shop' into api_score_meger

jyy

2021-08-02 b72820410a7989da5c645bedb849dc7cccb8faed

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

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

   public SysCompany selectForUpdate(Long comId);

   List<SysCompany> selectAll();
}