Merge branch 'dev/dev_xp' into dev/dev

# Conflicts:
#	src/main/java/com/ai/da/service/CollectionElementService.java
#	src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java

src/main/java/com/ai/da/mapper/primary/AccountMapper.java

@@ -2,8 +2,8 @@ package com.ai.da.mapper.primary;
 
 import com.ai.da.common.config.mybatis.plus.CommonMapper;
 import com.ai.da.mapper.primary.entity.Account;
+import com.ai.da.model.dto.AccountCreditsUsageDTO;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -32,4 +32,8 @@ public interface AccountMapper extends CommonMapper<Account> {
 
     void toVisitor(Long id);
 
+    List<AccountCreditsUsageDTO> selectCreditUsage(boolean groupByEvent, String changeEvent, String role, String userEmail, Long id, String startTime, String endTime, Integer size, Integer offset);
+
+    int countCreditUsage(boolean groupByEvent, String changeEvent, String role, String userEmail, Long id, String startTime, String endTime);
+
 }

src/main/java/com/ai/da/mapper/primary/DesignMapper.java

@@ -18,7 +18,7 @@ public interface DesignMapper extends CommonMapper<Design> {
     //返回插入数据后生成的主键
     Long insertDesign(Design design);
 
-    List<UserDesignStatisticDTO> getDesignStatistic(String startTime, String endTime, List<Long> ids, String email);
+    List<UserDesignStatisticDTO> getDesignStatistic(String startTime, String endTime, List<Long> ids, String email, String role);
 
     List<Design> selectDeleteList();
 }

src/main/java/com/ai/da/mapper/primary/entity/Library.java

@@ -69,6 +69,8 @@ public class Library implements Serializable {
      */
     private Integer width;
 
+    private String segmentedData;
+
     /**
      * 创建时间
      */