
Conflicts: pom.xml ruoyi-admin/pom.xml ruoyi-admin/src/main/resources/application.yml ruoyi-common/pom.xml ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java ruoyi-framework/pom.xml ruoyi-generator/pom.xml ruoyi-quartz/pom.xml ruoyi-system/pom.xml ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml ruoyi-ui/package.json ruoyi-ui/src/components/ImageUpload/index.vue ruoyi-ui/src/components/ThemePicker/index.vue ruoyi-ui/src/layout/components/Sidebar/Link.vue ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue ruoyi-ui/src/router/index.js ruoyi-ui/src/views/index.vue ruoyi-ui/src/views/tool/gen/editTable.vue ruoyi-ui/src/views/tool/gen/index.vue sql/ry_20210908.sql
34 lines
935 B
XML
34 lines
935 B
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
<parent>
|
|
<artifactId>ruoyi-vue-plus</artifactId>
|
|
<groupId>com.ruoyi</groupId>
|
|
<version>3.1.0</version>
|
|
</parent>
|
|
<modelVersion>4.0.0</modelVersion>
|
|
|
|
<artifactId>ruoyi-system</artifactId>
|
|
|
|
<description>
|
|
system系统模块
|
|
</description>
|
|
|
|
<dependencies>
|
|
|
|
<!-- 通用工具-->
|
|
<dependency>
|
|
<groupId>com.ruoyi</groupId>
|
|
<artifactId>ruoyi-common</artifactId>
|
|
</dependency>
|
|
|
|
<!-- OSS功能模块 -->
|
|
<dependency>
|
|
<groupId>com.ruoyi</groupId>
|
|
<artifactId>ruoyi-oss</artifactId>
|
|
</dependency>
|
|
|
|
</dependencies>
|
|
|
|
</project> |