Merge branch 'developer' into alpha

935090232@qq.com

2022-05-03 3236778a727a75bdb2f6fcb752c59068ec12ac28

 zq-erp/pom.xml

@@ -100,6 +100,11 @@
            <artifactId>spring-boot-starter-websocket</artifactId>
        </dependency>
        <dependency>
            <groupId>com.sun.mail</groupId>
            <artifactId>javax.mail</artifactId>
            <version>1.6.2</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
            <exclusions>