Merge branch 'dev/dev_xp' into dev/dev

# Conflicts:
#	src/main/java/com/ai/da/common/RabbitMQ/MQConfig.java

src/main/resources/application-dev.properties

@@ -77,10 +77,11 @@ spring.redis.lettuce.pool.max-wait=5
 
 redis.key.orderForGenerate=OrderForGenerate
 redis.key.generateCancelSet=GenerateCancelSet
-redis.key.generateExceptionMap=GenerateExceptionMap
+redis.key.generateExceptionMap=Generate:Exception
 redis.key.resultMap=ResultMap
 redis.key.orderForSR=OrderForSR
 redis.key.SRCancelSet=SRCancelSet
 redis.key.SRExceptionMap=SRExceptionMap
 redis.key.taskList=TaskList
-redis.key.credits.pre-deduction=Credits:PreDeduction
+redis.key.credits.pre-deduction=Credits:PreDeduction
+redis.key.generateResult=Generate:Result