Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-26 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f

 sys/pom.xml

@@ -16,17 +16,51 @@
    <packaging>jar</packaging>

    <dependencies>
        <!--用户服务-->
        <dependency>
            <groupId>com.yunchu.limslaboratory</groupId>
            <artifactId>user-server</artifactId>
            <version>${project.parent.version}</version>
        </dependency>
        <!--基础框架类-->
        <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>
            <artifactId>user-server</artifactId>
            <version>${project.parent.version}</version>
        </dependency>

        <!--标准库模块-->
        <dependency>
            <groupId>com.yunchu.limslaboratory</groupId>
            <artifactId>standard-server</artifactId>
            <version>${project.parent.version}</version>
        </dependency>

        <!--检验模块-->
        <dependency>
            <groupId>com.yunchu.limslaboratory</groupId>
            <artifactId>inspection-server</artifactId>
            <version>${project.parent.version}</version>
        </dependency>

        <!--实验室模块-->
        <dependency>
            <groupId>com.yunchu.limslaboratory</groupId>
            <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-->
@@ -35,24 +69,20 @@
            <artifactId>druid</artifactId>
        </dependency>

        <!--mybatis-plus-->
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-boot-starter</artifactId>
        </dependency>

        <!--mybatis-plus代码生成器-->
        <dependency>
            <groupId>com.baomidou</groupId>
            <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>