Merge branch 'score_shop' into api_score_meger

jyy

2022-01-23 c381ee31e4bc8c186878ac0178164f3604516783

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

@@ -41,4 +41,5 @@

   public SysRolePwoerFn selectForUpdate(Long rpfId);

   int deleteByFns(@Param("companyId") Long comId, @Param("list") List<String> deletedFn);
}