代码合并解决冲突 bug修改

无关风月

3 天以前 e56c1cce484cd8df8c3373d4e2b5847d11b09abe

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/OaApprovalFlowNodeMapper.java

@@ -13,4 +13,5 @@
 */
public interface OaApprovalFlowNodeMapper extends BaseMapper<OaApprovalFlowNode> {


}