fix:小结查重接口-任务表增加小结是否重复字段，ai统计弹窗接口，完善返回值 #103

Merged

cuihaojie merged 3 commits from fix/Picture_query_interface into test

cuihaojie commented

There is no content yet.

cuihaojie added 1 commit

198f4e8c33 fix:小结查重接口-任务表增加小结是否重复字段，ai统计弹窗接口，完善返回值

cuihaojie added 2 commits

b1c92d0ac7 Merge branch 'test' into fix/Picture_query_interface

# Conflicts:
#	jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java
#	jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml

6845d22efb fix:解决合并冲突

cuihaojie merged commit ab2f08c433 into test 2 years ago

cuihaojie deleted branch fix/Picture_query_interface

cuihaojie referenced this issue from a commit

Merge pull request 'fix:小结查重接口-任务表增加小结是否重复字段，ai统计弹窗接口，完善返回值' (#103) from fix/Picture_query_interface into test

The pull request has been merged as ab2f08c433.

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: guoxiangbin/ocr#103