update 修复合并异常

疯狂的狮子li

2021-09-26 770217513056ef60d5a10a705d8f75ca11d7d5af

 ruoyi-admin/pom.xml

@@ -36,6 +36,11 @@
            <artifactId>ruoyi-framework</artifactId>
        </dependency>

        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-system</artifactId>
        </dependency>

        <!-- 定时任务-->
        <dependency>
            <groupId>com.ruoyi</groupId>