Merge branch 'cjl' into qa

cjl

2023-10-20 cbdb9ea8d17e07dda2362d1c61e867afe8395ef2

 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>