fix conflict

Helius

2022-02-14 59cf24b0aba393e145f4ba3d58e98b7a01a80992

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