Merge branch 'dev' of xiongzhu/raex_back into master

src/main/java/com/izouma/nineth/repo/AssetRepo.java

@@ -158,6 +158,6 @@ public interface AssetRepo extends JpaRepository<Asset, Long>, JpaSpecificationE
 
     Long countAllByCollectionIdAndUserIdAndSource(Long collectionId, Long userId, AssetSource source);
 
-    @Query(nativeQuery = true, value = "select count(a.id) count,a.owner_id userId,a.owner_avatar avatar,a.`owner` nickname from asset a inner join `user` u on u.id = a.owner_id where a.status = 'NORMAL' and a.type = 'DOMAIN' GROUP BY a.owner_id ORDER BY count(a.id) desc limit 20")
-    List<Map<String,Object>> domainTop20();
+    @Query(nativeQuery = true, value = "select count(a.id) countNum,a.owner_id userId,a.owner_avatar avatar,a.`owner` nickname from asset a inner join `user` u on u.id = a.owner_id where a.status = 'NORMAL' and a.type = 'DOMAIN' GROUP BY a.owner_id ORDER BY count(a.id) desc limit 20")
+    List<Map<String, Object>> domainTop20();
 }

src/main/java/com/izouma/nineth/repo/DomainOrderRepo.java

@@ -30,7 +30,7 @@ public interface DomainOrderRepo extends JpaRepository<DomainOrder, Long>, JpaSp
 
     Integer countAllByDomainNameEqualsAndOrderStatusNot(String name, OrderStatus status);
 
-    @Query(value = "select c.domainName,c.endTime,c.id from DomainOrder c where c.picName = ?1 and c.orderStatus <> ?2")
+    @Query(value = "select c from DomainOrder c where c.picName = ?1 and c.orderStatus <> ?2")
     Page<DomainOrder> searchUsedDomain(String name, OrderStatus status, Pageable pageable);
 
     List<DomainOrder> findByOrderStatusAndCreatedAtBeforeAndDelFalse(OrderStatus orderStatus, LocalDateTime createdAt);