Merge remote-tracking branch 'origin/develop' into develop

2023-11-20 15:06:29 +08:00
parent 4971f2b96a 13208fed14
commit 091c11c951
7 changed files with 118 additions and 42 deletions
--- a/src/main/resources/messages_en.properties
+++ b/src/main/resources/messages_en.properties
@@ -128,6 +128,7 @@ layers.does.not.exists=layers does not exists.
 unknown.generate.type=unknown generate type.
 the.workspace.lastIndex.not.found=The workspace lastIndex not found.
 gender.cannot.be.empty=gender cannot be empty.
+image.synthesis.failed=Image synthesis failed.

 # 可能会报异常
 # Informative: