Merge branch 'api_score_meger' into alpha

Helius

2022-02-14 c34b0342177c90564ee5c9d3ef25c7442aaf71ba

 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);
}