Merge branch 'dev/dev_xp' into dev/3.1_release_merge

# Conflicts:
#	src/main/java/com/ai/da/python/PythonService.java
#	src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java

src/main/resources/messages_en.properties

@@ -186,6 +186,9 @@ order.creation.failed=Order creation failed.
 order.deduction.failed=Order deduction failed.
 order.query.failed=Order query failed.
 do.not.have.the.permission.to.delete.this.comment=You do not have the permission to delete this comment.
+unknow.affiliate=Unknown affiliate id.
+unknown.operationType=Unknown operationType.
+unknown.mode=unknown mode
 
 # 可能会报异常
 # Informative:

src/main/resources/messages_zh.properties

@@ -182,6 +182,9 @@ order.creation.failed=订单创建失败
 order.deduction.failed=订单金额扣除失败。
 order.query.failed=订单查询失败
 do.not.have.the.permission.to.delete.this.comment=您没有权限删除此评论
+unknow.affiliate=未知推广者id
+unknown.operationType=未知操作类型
+unknown.mode=未知模式
 
 # 可能会报异常
 # Informative: