Merge branch 'developer'

Helius

2022-05-31 5ec9991915648a20179481ec519510629f5d0cf3

 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>