Merge remote-tracking branch 'origin/hot-fix' into hot-fix
# Conflicts:
# Debate_backend/target/classes/application.yml
# Debate_backend/target/classes/com/learning/newdemo/Dto/ArgumentDetailDTO.class
# Debate_backend/target/classes/com/learning/newdemo/Dto/ConversationDTO.class
# Debate_backend/target/classes/com/learning/newdemo/Dto/DebateDetailDTO.class
# Debate_backend/target/classes/com/learning/newdemo/Dto/ReviewDetailDTO.class
# Debate_backend/target/classes/com/learning/newdemo/controller/WxAIController.class
# Debate_backend/target/classes/com/learning/newdemo/controller/WxConversationController.class
# Debate_backend/target/classes/com/learning/newdemo/entity/WxArgument.class
# Debate_backend/target/classes/com/learning/newdemo/entity/WxConversation.class
# Debate_backend/target/classes/com/learning/newdemo/entity/WxDebate.class
# Debate_backend/target/classes/com/learning/newdemo/entity/WxReview.class
# Debate_backend/target/classes/com/learning/newdemo/service/impl/WxUserServiceImpl.class
# Debate_backend/target/classes/com/learning/newdemo/util/JwtUtil.class
|
chantouRichard
heiferleaf