Merge remote-tracking branch 'origin/test' into test

cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkOcrDTO.java

@@ -0,0 +1,43 @@
+
+package com.czg.market.dto;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import com.alibaba.fastjson2.annotation.JSONField;
+import lombok.experimental.Accessors;
+import java.io.Serial;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * ocr识别结果 实体类。
+ *
+ * @author zs
+ * @since 2025-11-26
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+public class MkOcrDTO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    /**
+     * 响应内容
+     */
+    private String resp;
+
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
+
+    private Integer shopId;
+
+}

cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkOcr.java

@@ -0,0 +1,49 @@
+package com.czg.market.entity;
+
+import com.mybatisflex.annotation.Column;
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import com.mybatisflex.annotation.Table;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import java.io.Serial;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * ocr识别结果 实体类。
+ *
+ * @author zs
+ * @since 2025-11-26
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("mk_ocr")
+public class MkOcr implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    @Id(keyType = KeyType.Auto)
+    private Integer id;
+
+    /**
+     * 响应内容
+     */
+    private String resp;
+
+    @Column(onInsertValue = "now()")
+    private LocalDateTime createTime;
+
+    @Column(onInsertValue = "now()", onUpdateValue = "now()")
+    private LocalDateTime updateTime;
+
+    private Long shopId;
+
+}

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

@@ -0,0 +1,14 @@
+package com.czg.product.entity;
+
+import com.mybatisflex.core.service.IService;
+import com.czg.market.entity.MkOcr;
+
+/**
+ * ocr识别结果 服务层。
+ *
+ * @author zs
+ * @since 2025-11-26
+ */
+public interface MkOcrService extends IService<MkOcr> {
+
+}

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

@@ -78,5 +78,7 @@ public interface ConsStockFlowService extends IService<ConsStockFlow> {
      */
     void saveFlow(ConsStockFlow entity);
 
-    ConsInOutStockHeadParam ocr(String originalFilename, InputStream inputStream);
+    Integer ocr(String originalFilename, InputStream inputStream);
+
+    ConsInOutStockHeadParam ocrDetail(Long id);
 }