Merge remote-tracking branch 'origin/dev' into cjl

cjl

2023-08-09 83e42707519f5e2d886618ea55c30e8c3ab381ac

 pom.xml

@@ -115,7 +115,7 @@
            <scope>test</scope>
        </dependency>
        <dependency>
            <groupId>com.google.code.kaptcha</groupId>
            <groupId>com.github.penggle</groupId>
            <artifactId>kaptcha</artifactId>
            <version>2.3.2</version>
        </dependency>