From 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 13:30:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
sys/pom.xml | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/sys/pom.xml b/sys/pom.xml
index fb7feff..a6d901c 100644
--- a/sys/pom.xml
+++ b/sys/pom.xml
@@ -16,6 +16,19 @@
<packaging>jar</packaging>
<dependencies>
+ <!--鍩虹妗嗘灦绫�-->
+ <dependency>
+ <groupId>com.yunchu.limslaboratory</groupId>
+ <artifactId>framework</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <!--cnas妯″潡-->
+ <dependency>
+ <groupId>com.yuanchu.limslaboratory</groupId>
+ <artifactId>cnas-server</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+
<!--鐢ㄦ埛鏈嶅姟妯″潡-->
<dependency>
<groupId>com.yunchu.limslaboratory</groupId>
@@ -37,11 +50,17 @@
<version>${project.parent.version}</version>
</dependency>
- <!--鍩虹妗嗘灦绫�-->
+ <!--瀹為獙瀹ゆā鍧�-->
<dependency>
<groupId>com.yunchu.limslaboratory</groupId>
- <artifactId>framework</artifactId>
+ <artifactId>laboratory-server</artifactId>
<version>${project.parent.version}</version>
+ </dependency>
+ <!--鏅鸿兘鍥捐〃妯″潡-->
+ <dependency>
+ <groupId>com.yuanchu</groupId>
+ <artifactId>chart-server</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
</dependency>
<!--druid-->
@@ -56,12 +75,14 @@
<artifactId>mybatis-plus-generator</artifactId>
</dependency>
- <!-- framework: mybatis-plus浠ｇ爜鐢熸垚闇�瑕佷竴涓ā鏉垮紩鎿� -->
+ <!-- https://mvnrepository.com/artifact/org.apache.velocity/velocity-engine-core -->
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-freemarker</artifactId>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine-core</artifactId>
+ <version>2.3</version>
</dependency>
+
<!--mysql-->
<dependency>
<groupId>mysql</groupId>
--
Gitblit v1.9.3