Merge branch 'release/3.0' into dev/dev_xp

# Conflicts:
#	src/main/java/com/ai/da/mapper/primary/DesignMapper.java
#	src/main/resources/mapper/primary/DesignMapper.xml

src/main/resources/mapper/primary/DesignMapper.xml

@@ -26,4 +26,18 @@
         #{createDate});
     </insert>
 
+    <select id="getDesignStatistic" resultType="com.ai.da.model.dto.UserDesignStatisticDTO" parameterType="String">
+        select a.account_id,count(a.account_id) use_design_times,b.user_email,b.user_name,b.is_trial
+        from t_design a
+        left join `t_account` b
+        on a.account_id = b.id
+        <where>
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                a.create_date between #{startTime} and #{endTime}
+            </if>
+        </where>
+        GROUP BY a.account_id
+        ORDER BY a.account_id ASC;
+    </select>
+
 </mapper>