Merge remote-tracking branch 'origin/master'

cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDetailDTO.java

@@ -1,11 +1,14 @@
 package com.czg.account.dto.shopuser;
 
+import com.czg.account.entity.ShopExtend;
 import com.czg.account.entity.ShopInfo;
 import com.czg.account.entity.ShopUser;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author Administrator
@@ -30,6 +33,13 @@ public class ShopUserDetailDTO extends ShopUser {
      */
     private Long shopId;
 
+    /**
+     * 店铺信息
+     */
     private ShopInfo shopInfo;
+    /**
+     * 店铺拓展参数
+     */
+    private List<ShopExtend> shopExtendList = new ArrayList<>();
 
 }

cash-common/cash-common-service/src/main/java/com/czg/product/service/ConsStockFlowService.java

@@ -5,6 +5,7 @@ import com.czg.product.param.ConsCheckStockParam;
 import com.czg.product.param.ConsInOutStockHeadParam;
 import com.czg.product.param.ConsReportDamageParam;
 import com.czg.product.vo.ConsCheckStockRecordVo;
+import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.service.IService;
 
 import java.util.List;
@@ -38,6 +39,14 @@ public interface ConsStockFlowService extends IService<ConsStockFlow> {
      */
     void checkStock(ConsCheckStockParam param);
 
+    /**
+     * 获取盘点记录
+     *
+     * @param conId 耗材id
+     * @return 盘点记录列表
+     */
+    Page<ConsCheckStockRecordVo> getCheckStockRecordPage(Long conId);
+
     /**
      * 获取盘点记录
      *