Tankaikai f27ca3228c Merge remote-tracking branch 'origin/es' into es_release_0.1 ...

# Conflicts:
#	src/main/java/com/sqx/modules/app/entity/UserEntity.java
#	src/main/java/com/sqx/modules/app/entity/UserInfo.java
#	src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java
#	src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java
#	src/main/java/com/sqx/modules/course/entity/CourseCollect.java
#	src/main/java/com/sqx/modules/course/entity/CourseUser.java
#	src/main/java/com/sqx/modules/discSpinning/entity/DiscSpinningRecord.java
#	src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java
#	src/main/java/com/sqx/modules/pay/entity/CashOut.java
#	src/main/java/com/sqx/modules/pay/entity/PayDetails.java
#	src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterRecord.java
#	src/main/java/com/sqx/modules/userSign/entity/UserSignRecord.java
#	src/main/resources/application-dev.yml
#	src/main/resources/application.yml

2025-01-13 10:22:04 +08:00

19 KiB

Raw Blame History

View Raw