aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/main/java/com/ai/da/python/PythonService.java
This commit is contained in:
xupei
2026-03-23 13:22:18 +08:00
parent aed338a6d7 3e53401f76
commit 75eca8d6ba
14 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/ai/da/python/PythonService.java
View File

@@ -3997,8 +3997,13 @@ public class PythonService {
// throw new BusinessException("system.error");
// }
//**********************end***********************************
if (category.split("_")[0].equals("male")&&style.toLowerCase().equals("lolita")){
style=null;
//临时补丁
if (category != null && style != null) {
String categoryPrefix = category.split("_")[0];
if ("male".equals(categoryPrefix) &&
(style.equalsIgnoreCase("lolita") || style.equalsIgnoreCase("romantic"))) {
style = null;
}
}
AuthPrincipalVo userHolder = UserContext.getUserHolder();