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/mapper/secondary/AttributeRetrievalMapper.xml

@@ -32,7 +32,9 @@
             <if test="style != null">
                 AND style = #{style}
             </if>
-
+            <if test="isFemaleTable">
+                AND deprecated = 0
+            </if>
         </trim>
         ORDER BY
         RAND()
@@ -48,7 +50,9 @@
             <if test="style != null">
                 AND style = #{style}
             </if>
-
+            <if test="isFemaleTable">
+                AND deprecated = 0
+            </if>
         </trim>
         ORDER BY
             RAND()
@@ -73,7 +77,9 @@
             <if test="style != null">
                 AND style = #{style}
             </if>
-
+            <if test="isFemaleTable">
+                AND deprecated = 0
+            </if>
         </trim>
         ORDER BY
         RAND()