Merge remote-tracking branch 'origin/master'

fhx

2023-07-21 f1d42ad1690159824dc0582e2d9a91cefd3df899

 pom.xml

@@ -39,6 +39,11 @@
            <artifactId>cos_api</artifactId>
        </dependency>

        <dependency>
            <groupId>commons-fileupload</groupId>
            <artifactId>commons-fileupload</artifactId>
        </dependency>

        <!--发送邮件-->
        <dependency>
            <groupId>com.sun.mail</groupId>
@@ -141,6 +146,12 @@
            <artifactId>jstl</artifactId>
        </dependency>

        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-tomcat</artifactId>
            <!--<scope>provided</scope>-->
        </dependency>

        <!-- mybatis自动生成 -->
        <dependency>
            <groupId>com.gitee.sunchenbin.mybatis.actable</groupId>