Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/annotation/LimitSubmit.java
#	src/main/java/com/chaozhanggui/system/cashierservice/interceptor/LimitSubmitAspect.java
#	src/main/java/com/chaozhanggui/system/cashierservice/interceptor/WebAppConfigurer.java
#	src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
#	src/main/java/com/chaozhanggui/system/cashierservice/util/RedisConfig.java
#	src/main/java/com/chaozhanggui/system/cashierservice/util/RedisUtils.java
#	src/main/resources/generator-mapper/generatorConfig.xml
This commit is contained in:
韩鹏辉
2024-06-19 16:46:27 +08:00
4 changed files with 58 additions and 2 deletions

View File

@@ -1,5 +1,5 @@
server:
port: 10587
port: 10589
spring:
application:
name: cashierService