Merge branch 'refs/heads/release/3.0' into dev/dev_xp

# Conflicts:
#	src/main/java/com/ai/da/common/utils/RedisUtil.java
#	src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
#	src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java

src/main/resources/messages_zh.properties

@@ -182,8 +182,8 @@ OVERALL=整体
 TOPS=上装
 BOTTOMS=下装
 OUTWEAR=外套
-BLOUSE=衬衫
-DRESS=长裙
+BLOUSE=上衣
+DRESS=连衣裙
 TROUSERS=裤子
 SKIRT=短裙
 FEMALE=女装