Merge remote-tracking branch 'origin/master'

Fixiaobai

2023-08-10 c9c4976f4e1e553edc98e4171a1d1741bde542f5

 sys/pom.xml

@@ -22,6 +22,12 @@
            <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>
@@ -63,12 +69,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>