diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsInfo.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsInfo.java
index cd0affbd..9d06b59d 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsInfo.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsInfo.java
@@ -25,6 +25,8 @@ import javax.validation.constraints.*;
 import java.sql.Timestamp;
 import java.math.BigDecimal;
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
 * @author admin
@@ -108,7 +110,7 @@ public class TbConsInfo implements Serializable {
     private String isCheck;
 
     @Transient
-    private String product;
+    private List<Map<Integer, Object>> product;
 
     public void copy(TbConsInfo source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/repository/TbConsInfoRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/repository/TbConsInfoRepository.java
index c58ea621..5b7c1a93 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/repository/TbConsInfoRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/repository/TbConsInfoRepository.java
@@ -9,6 +9,7 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
+import java.util.Map;
 
 /**
 * @website https://eladmin.vip
@@ -26,11 +27,11 @@ public interface TbConsInfoRepository extends JpaRepository<TbConsInfo, Integer>
 
 
     @Query(value =
-            "SELECT CONCAT(pro.id, '_', pro.NAME) AS product" +
+            "SELECT pro.id, pro.name" +
             "    FROM" +
             "        tb_prosku_con conPro" +
             "        LEFT JOIN tb_product pro ON conPro.product_id = pro.id AND pro.shop_id = :shopId AND conPro.shop_id = :shopId" +
             "  where conPro.con_info_id = :conInfoId " +
             "  group by conPro.product_id ",nativeQuery = true)
-    List<String> queryAllAndPro(@Param("shopId") Integer shopId,@Param("conInfoId")Integer conInfoId);
+    List<Map<Integer, Object>> queryAllAndPro(@Param("shopId") Integer shopId, @Param("conInfoId")Integer conInfoId);
 }
\ No newline at end of file
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbConsInfoDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbConsInfoDto.java
index 3742409b..5821dd6d 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbConsInfoDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbConsInfoDto.java
@@ -22,6 +22,8 @@ import javax.persistence.Column;
 import java.sql.Timestamp;
 import java.math.BigDecimal;
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
 * @author admin
@@ -81,5 +83,5 @@ public class TbConsInfoDto implements Serializable {
 
     private String isCheck;
 
-    private String product;
+    private List<Map<Integer, Object>> product;
 }
\ No newline at end of file
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
index 9d17a471..2c52b442 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
@@ -102,8 +102,8 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
         Page<TbConsInfo> page = tbConsInfoRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder), pageable);
         Page<TbConsInfoDto> result = page.map(tbConsInfoMapper::toDto);
         result.getContent().forEach(it -> {
-            List<String> list = tbConsInfoRepository.queryAllAndPro(criteria.getShopId(), it.getId());
-            it.setProduct(String.join(",", list));
+            List<Map<Integer, Object>> list = tbConsInfoRepository.queryAllAndPro(criteria.getShopId(), it.getId());
+            it.setProduct(list);
         });
         return PageUtil.toPage(result);
     }