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/java/com/ai/da/mapper/primary/DesignMapper.java

@@ -1,6 +1,10 @@
 package com.ai.da.mapper.primary;
 
 import com.ai.da.common.config.mybatis.plus.CommonMapper;
+//import com.ai.da.mapper.entity.Design;
+import com.ai.da.model.dto.UserDesignStatisticDTO;
+
+import java.util.List;
 import com.ai.da.mapper.primary.entity.Design;
 
 /**
@@ -13,4 +17,6 @@ public interface DesignMapper extends CommonMapper<Design> {
 
     //返回插入数据后生成的主键
     Long insertDesign(Design design);
+
+    List<UserDesignStatisticDTO> getDesignStatistic(String startTime, String endTime);
 }