 shuliYao
|
4f50317ec6
|
fix: 解决查重结果返回排序问题
|
1 year ago |
|
shuliYao
|
143922c5f9
|
fix: 图审相似度主图查询，排序规则改变
|
1 year ago |
|
yaoshuli
|
6040528bc4
|
Merge pull request 'feat: 图审相似度列表接口，增加相似度分组排序' (#37) from feature/taskPageSimilarityGroupOrder into test
Reviewed-on: #37
|
1 year ago |
|
shuliYao
|
77110f5ffa
|
feat: 图审相似度列表接口，增加相似度分组排序
|
1 year ago |
sunchenliang
|
425ac204f6
|
fix: 相似度列表添加任务信息
|
1 year ago |
 DELL
|
e9fe05c8c1
|
fix:调整一键查重和图审审批弹窗接口
|
1 year ago |
 LILI
|
c6f812040d
|
fix:1.查重任务添加可以文件判断过滤
|
1 year ago |
|
sunchenliang
|
39a3307341
|
fix: 修改任务包列表
|
1 year ago |
|
sunchenliang
|
1008932b63
|
Merge remote-tracking branch 'origin/test' into sunchenliang
|
1 year ago |
|
sunchenliang
|
e0e5d9863a
|
fix: 修改任务包列表
|
1 year ago |
|
sunchenliang
|
2a512486ea
|
fix: 修改任务包列表
|
1 year ago |
|
sunchenliang
|
3df983cb94
|
fix: 修改任务审批
|
1 year ago |
 sunchenliang
|
58a6399fc0
|
Merge pull request 'fix: 修改任务审批筛选' (#30) from sunchenliang into test
Reviewed-on: #30
|
1 year ago |
|
sunchenliang
|
10c4288243
|
fix: 修改任务审批筛选
|
1 year ago |
|
cuihaojie
|
139090358b
|
Merge pull request 'fix:修改ai审批工具接口，未修改完整，因为需要拉代码拿一个新增接口，所以先暂时提交部分代码' (#29) from fix/aiApprovalToolPopup into test
Reviewed-on: #29
|
1 year ago |
|
DELL
|
244d922752
|
fix:修改ai审批工具接口，未修改完整，因为需要拉代码拿一个新增接口，所以先暂时提交部分代码
|
1 year ago |
|
sunchenliang
|
002890a4e4
|
Merge pull request 'sunchenliang' (#28) from sunchenliang into test
Reviewed-on: #28
|
1 year ago |
|
shuliYao
|
950ac308df
|
fix: 解决查重时因为某张图片没有下载到本地，导致查重任务异常问题
|
1 year ago |
|
sunchenliang
|
18389bd9b5
|
Merge remote-tracking branch 'origin/test' into sunchenliang
# Conflicts:
# jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskPackageMapper.xml
|
1 year ago |
|
sunchenliang
|
91cd05ac83
|
fix: 任务包列表添加是否删除标识，增加查询图片节点状态接口
|
1 year ago |
|
sunchenliang
|
84347984b3
|
Merge pull request 'fix: 1.修改小结查重返回参数' (#25) from sunchenliang into test
Reviewed-on: #25
|
1 year ago |
|
sunchenliang
|
909e625575
|
fix: 1.修改小结查重返回参数
|
1 year ago |
|
sunchenliang
|
0748b452bf
|
Merge pull request 'fix: 1.修改小结查重返回参数' (#24) from sunchenliang into test
Reviewed-on: #24
|
1 year ago |
|
sunchenliang
|
23ec8ab108
|
fix: 1.修改小结查重返回参数
|
1 year ago |
|
cuihaojie
|
c0dee71196
|
Merge pull request 'fix:修改ai审批工具接口，调整查询表和返回数据' (#23) from fix/aiApprovalTool into test
Reviewed-on: #23
|
1 year ago |
|
DELL
|
0ccbf8bbfc
|
fix:修改ai审批工具接口，调整查询表和返回数据
|
1 year ago |
|
sunchenliang
|
a31e94d28e
|
Merge pull request 'fix: 1.修改小结查重2.修改创建任务' (#22) from sunchenliang into test
Reviewed-on: #22
|
1 year ago |
|
sunchenliang
|
b8721bd84a
|
fix: 1.修改小结查重2.修改创建任务
|
1 year ago |
|
LILI
|
b23b54cb78
|
Merge branch 'test' into dev-lili-330
|
1 year ago |
|
LILI
|
383d28870e
|
fix:1.代码合并问题
|
1 year ago |
|
DELL
|
85f66e192c
|
fix:ai统计接口去掉24小时限制
|
1 year ago |
|
lili
|
c056ec056e
|
Merge pull request 'dev-lili-330' (#19) from dev-lili-330 into test
Reviewed-on: #19
|
1 year ago |
|
LILI
|
22a78f1c07
|
Merge branch 'test' into dev-lili-330
# Conflicts:
# jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskPackageMapper.xml
|
1 year ago |
|
shuliYao
|
57cc29f86e
|
feat: 创建任务包后 增加对象返回
|
1 year ago |
|
LILI
|
0ff031169b
|
fix:1.一键查重提报人模糊搜索 2.AI工单模糊搜索 3.AI工单任务包倒排序处理
|
1 year ago |
|
shuliYao
|
5dec7d2c04
|
fix: 默认提报日期和拍照日期
|
1 year ago |
|
yaoshuli
|
c1ab8e2015
|
Merge pull request 'feature: 增加业务字典，根据value反差label接口。' (#16) from feature/queryDictionaryByValueOrKye into test
Reviewed-on: #16
|
1 year ago |
|
shuliYao
|
a151f9047a
|
feature: 增加业务字典，根据value反差label接口。
1.增加字典value反差label接口
2.修改任务包列表查询接口，替换提报人id为提报人名称
|
1 year ago |
|
LILI
|
5295d09942
|
Merge remote-tracking branch 'origin/dev-lili-330' into test
|
1 year ago |
|
LILI
|
ddbcbd474d
|
add：新增获取AI查询过滤条件回写接口
|
1 year ago |
|
cuihaojie
|
da6156c425
|
Merge pull request 'fix:修改忘记密码_修改密码模块，符合修改密码策略' (#14) from fix/forgotPassword_2727 into test
Reviewed-on: #14
|
1 year ago |
|
DELL
|
94e26c88fd
|
fix:修改忘记密码_修改密码模块，符合修改密码策略
|
1 year ago |
|
sunchenliang
|
5c110b5df3
|
Merge pull request 'fix: 完善任务详情信息' (#13) from sunchenliang into test
Reviewed-on: #13
|
1 year ago |
|
sunchenliang
|
76b7df199d
|
fix: 完善任务详情信息
|
1 year ago |
|
sunchenliang
|
96617e1525
|
Merge pull request 'fix: 任务启动添加提报日期' (#12) from sunchenliang into test
Reviewed-on: #12
|
1 year ago |
|
sunchenliang
|
322be423b9
|
fix: 任务启动添加提报日期
|
1 year ago |
|
sunchenliang
|
829a0aa97f
|
Merge pull request 'fix: 修改任务审批监听' (#11) from sunchenliang into test
Reviewed-on: #11
|
1 year ago |
|
sunchenliang
|
22c7810274
|
fix: 修改任务审批监听
|
1 year ago |
|
sunchenliang
|
f7ce84d86d
|
Merge pull request 'fix: 修改获取用户信息及任务包接口' (#8) from sunchenliang into test
Reviewed-on: #8
|
1 year ago |
|
sunchenliang
|
5f1bc17a5c
|
fix: 修改获取用户信息及任务包接口
|
1 year ago |
|
DELL
|
a235b507d4
|
fix:工具类修改时间格式，我的终审列表查询_时间查询_修改时间格式
|
1 year ago |
|
yaoshuli
|
86610ec292
|
Merge pull request 'feature:修改图片识别水印模块' (#6) from feature/pictureWatermarkAnalysis_2761 into test
Reviewed-on: #6
|
1 year ago |
|
DELL
|
957883d0a3
|
feature:修改图片识别水印模块
|
1 year ago |
|
sunchenliang
|
6f0bb8fce8
|
Merge pull request 'refactor：修改相似度列表' (#4) from sunchenliang into test
Reviewed-on: #4
|
1 year ago |
|
sunchenliang
|
9cb6c446b2
|
refactor/1.修改相似度列表
2.完善无量云回传
3.用户添加节点类型
4.用户审批历史记录添加
5.任务列表添加提交时间
|
1 year ago |
|
shuliYao
|
144df64bd0
|
fix: 解决图片查询接口，时间、图片相似度排序bug问题
|
1 year ago |
|
yaoshuli
|
b51d6bbc04
|
Merge pull request 'fix: 修复图片查询，阈值区间比对不正确问题' (#2) from fix/queryPictureByIzsimilarityNull into test
Reviewed-on: #2
|
1 year ago |
|
sunchenliang
|
f7cf61567b
|
refactor(修改任务包列表):修改任务包列表增加全量筛选项
|
1 year ago |
|
shuliYao
|
e86ff9f8fc
|
fix: 修复图片查询，阈值区间比对不正确问题
|
1 year ago |
|
sunchenliang
|
646ace6e5d
|
提交无量云回传相关
|
1 year ago |
|
sunchenliang
|
fbbff17114
|
优化批量审批接口
|
1 year ago |
|
DELL
|
a44c24815e
|
Merge branch 'dev-cui'
# Conflicts:
# jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java
|
1 year ago |
|
DELL
|
3a35d7cd23
|
增加定时任务->拉取图片数据->并判断任务是否重复，修改识别拍照时间的代码，这些代码均已经注释
|
1 year ago |
lzCodeGarden
|
c847267d5c
|
配置文件数据库更改，后端页面路径指向
|
1 year ago |
|
sunchenliang
|
d51749801a
|
修改任务包详情历史记录
|
1 year ago |
|
DELL
|
31cae5bb3b
|
Merge branch 'dev-cui'
|
1 year ago |
|
DELL
|
a169ac057d
|
消息列表接口分页->查看更多->bug,登录获取用户信息接口bug,验证码登录时修改为手机号校验,拉取数据时提报时间和拍照时间的获取（暂时注释掉）,消息列表排序实现
|
1 year ago |
|
sunchenliang
|
7f2d61b402
|
修改获取任务包列表增加创建时间字段
|
1 year ago |
|
sunchenliang
|
5c9b8a15ff
|
优化审批相关流程
|
1 year ago |
|
sunchenliang
|
142dc2c080
|
工单及审批相关接口修改
|
1 year ago |
|
sunchenliang
|
712bb593bb
|
修改任务审批接口
|
1 year ago |
|
DELL
|
9b6e6f89b9
|
picture实体类加字段 拍照时间
|
1 year ago |
|
sunchenliang
|
d19cf2223b
|
工单相似列表优化
|
1 year ago |
|
sunchenliang
|
ae9661d5cf
|
任务包列表添加创建人
|
1 year ago |
|
sunchenliang
|
71eec4287b
|
修改工单列表及相关接口
|
1 year ago |
|
DELL
|
55d6676549
|
Merge branch 'dev-cui'
|
1 year ago |
|
DELL
|
c30e0e9ede
|
综合搜索功能修复查询bug，相似度查询增加当相似度起始区间包含0时，对相似度为null的数据也进行查询
|
1 year ago |
|
sunchenliang
|
48d1881d5e
|
修改任务包列表
|
1 year ago |
|
707464720@qq.com
|
cf9a24596f
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
707464720@qq.com
|
ecbd92dad7
|
Merge branch 'dev-lili'
|
1 year ago |
|
707464720@qq.com
|
ef562ea16e
|
fix:1.AI查重页面图片查询-相似度、时间排序不生效问题处理
|
1 year ago |
|
sunchenliang
|
cc6a88e0c3
|
修改任务包列表
|
1 year ago |
|
sunchenliang
|
31d98eecdb
|
开发任务单详情及相似度列表
|
1 year ago |
|
sunchenliang
|
311ea02a71
|
开发任务单详情及相似度列表
|
1 year ago |
|
DELL
|
640419d136
|
图片查询->相似度查询
|
1 year ago |
|
DELL
|
6ab5ea4f3d
|
字段表增加是否高亮和是否可点击字段
|
1 year ago |
|
707464720@qq.com
|
86dd2cfee2
|
Merge branch 'dev-lili'
|
1 year ago |
|
707464720@qq.com
|
90e4a2a83d
|
add:1.登录返回用户前端菜单权限列表 2.根据查重任务编号，获取到当前查重任务的结果
|
1 year ago |
|
sunchenliang
|
41e9626aa3
|
修改任务审批
|
1 year ago |
|
shuliYao
|
c9636fac90
|
feat: 解决一件查重 创建审核任务和比对相似度结果有问题
|
1 year ago |
|
sunchenliang
|
ed91a64ee1
|
修改一键查重添加创建任务方法
|
1 year ago |
|
shuliYao
|
047781e254
|
feat: 解决掉相似度阈值检索导致图片查询出问题
|
1 year ago |
|
shuliYao
|
353d28c90e
|
feat: 一件查重、创建任务包新逻辑调整
|
1 year ago |
|
shuliYao
|
15b105543f
|
Merge branch 'dev-lili'
|
1 year ago |
|
707464720@qq.com
|
7f10dfc1ea
|
add:AI一键查重功能改造方法实现
|
1 year ago |
|
sunchenliang
|
57e22e39b9
|
修改任务消息
|
1 year ago |
|
shuliYao
|
dbda330be8
|
feat: 解决消息通知bug
1.查询会漏掉全部消息
2.返回给前端id为long丢失精度，导致已读时对不上
3.解决read_flag为空,字段直接不返回问题
|
1 year ago |
|
shuliYao
|
74e83c4c96
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
shuliYao
|
56116fd0fa
|
feat: 清理无用字段类和代码,解决获取未读消息总数异常问题
|
1 year ago |
|
sunchenliang
|
063cfdb0f9
|
修改任务详情返回图片信息
|
1 year ago |
|
sunchenliang
|
92f56fa136
|
修改任务详情返回图片信息
|
1 year ago |
|
707464720@qq.com
|
46e66d684d
|
add:AI一键查重功能改造基础类提交
|
1 year ago |
|
shuliYao
|
80a2a14cd6
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
shuliYao
|
c9dde6a7f1
|
feat: 增加描述信息
|
1 year ago |
|
sunchenliang
|
4038b03337
|
修改任务详情返回图片信息
|
1 year ago |
|
sunchenliang
|
8750b393e2
|
修改相似度图片列表
|
1 year ago |
|
shuliYao
|
2ebeddfbeb
|
feat: 消息通知增加消息时间排序 默认倒序
|
1 year ago |
|
shuliYao
|
6bfb80660d
|
feat: 消息通知增加消息时间排序 默认倒序
|
1 year ago |
|
sunchenliang
|
2f0e40f304
|
修改一键查重
|
1 year ago |
|
sunchenliang
|
13813dd154
|
Merge remote-tracking branch 'origin/wujinhui'
|
1 year ago |
wujinhui
|
44f576e4d6
|
bug修改
|
1 year ago |
 lijingtao
|
f1f6de6427
|
可疑文件排查修改 都用图片id 并且限制这个用户添加过不能重复添加 列表预防空值报错返回限制
|
1 year ago |
|
lijingtao
|
3049235e8c
|
轮询接口和可疑文件限制
|
1 year ago |
|
ljt
|
b9acf812be
|
移入可疑文件夹和增加返回限制
|
1 year ago |
|
ljt
|
5351125ee1
|
可疑文件夹列表增加自定义排序
|
1 year ago |
|
ljt
|
2d5577f5c3
|
忘记密码效验返回error增加、综合搜索修改
|
1 year ago |
|
ljt
|
5be2580cba
|
可疑文件夹列表和移出可疑文件夹
|
1 year ago |
|
ljt
|
6149b38538
|
任务包-单任务详情-相似图片列表修改
|
1 year ago |
|
ljt
|
162cea8f85
|
判断修改
|
1 year ago |
|
lijingtao
|
266a8d337c
|
可疑文件夹修改传参方式
|
1 year ago |
|
sunchenliang
|
fc47a67318
|
修改任务审批列表
|
1 year ago |
|
ljt
|
2362043c07
|
可疑文件夹接口新增
|
1 year ago |
|
sunchenliang
|
b97e03e961
|
提交小结查重相关
|
1 year ago |
|
ljt
|
1f0acd7603
|
全文检索bug修改
|
1 year ago |
|
lijingtao
|
e6fd677957
|
补上字段
|
1 year ago |
|
lijingtao
|
11bdeeaea9
|
图片查询、图片查询-自定义过滤条件、相似度图片列表接口 增加是否在可疑文件夹排除
|
1 year ago |
|
ljt
|
d835c7dd6e
|
个人笔记接口排查 增加新增后 排序显示 原因是前端页面更改完显示还是老数据
|
1 year ago |
|
shuliYao
|
129c390345
|
feat: 提报日期转换时间戳、增加相似度阈值区间比对
|
1 year ago |
|
lijingtao
|
f504cccdf4
|
ai审批工具修改 添加批量假接口
|
1 year ago |
|
DELL
|
1d64a16ffb
|
我的审核任务列表，需要关联查询ocr_picture表，将查到的信息返回到前端，注意，返回有新建对象
|
1 year ago |
|
sunchenliang
|
4f800fc941
|
修改ai工单列表
|
1 year ago |
|
DELL
|
51ab9b6401
|
工单列表返回数据修改
|
1 year ago |
|
ljt
|
dbec394c92
|
修改ai统计修改传参租户id 增加缓存24小时
|
1 year ago |
|
sunchenliang
|
d1b55fa87d
|
审批成功通知下一审批人
|
1 year ago |
|
sunchenliang
|
c9202520f7
|
修改历史审查数据结构
|
1 year ago |
|
DELL
|
ce0469b591
|
任务包列表接口返回数据结构修复，终审高级检索接口实现
|
1 year ago |
|
sunchenliang
|
0732ed41f1
|
一键查重优化
|
1 year ago |
|
ljt
|
c19ed0d35c
|
综合搜索和前端对接 修改返回参类型
|
1 year ago |
|
DELL
|
db59a7adce
|
配合阿龙动态列显示，代码做了一些假数据
|
1 year ago |
|
ljt
|
06c63d0caf
|
阿里云短信api和pom.xml添加依赖，发送短信验证码增加验证码接口
|
1 year ago |
|
DELL
|
9c1155d359
|
Merge branch 'dev-cui-1'
|
1 year ago |
|
DELL
|
299cad893e
|
终审列表检索查询
|
1 year ago |
|
ljt
|
956aa0552f
|
综合搜索接口修改返回参数集合
|
1 year ago |
|
lzCodeGarden
|
f133c8e9a8
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
lzCodeGarden
|
0d535fd16e
|
配置文件数据库更改，后端页面路径指向
|
1 year ago |
|
shuliYao
|
2926cc2a3f
|
feat: 调整历史状态str值和当前节点数据补充位置，防止被前面查询覆盖
|
1 year ago |
|
DELL
|
1d7adfefb0
|
终审列表查询
|
1 year ago |
|
sunchenliang
|
4c0df12a73
|
添加图片最大相似值
|
1 year ago |
|
lijingtao
|
94b2cbec67
|
ai审批工具
|
1 year ago |
|
sunchenliang
|
2e64d7d50b
|
修改任务列表数据重复问题
|
1 year ago |
|
DELL
|
cbb632eb13
|
11
|
1 year ago |
|
DELL
|
d35902c27a
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
DELL
|
1dbeaefe4b
|
1
|
1 year ago |
|
sunchenliang
|
cbc6e13672
|
修改任务列表数据重复问题
|
1 year ago |
|
shuliYao
|
240fd8b644
|
feat: 解决动态列新增失败问题
|
1 year ago |
|
lzCodeGarden
|
c0fc50acef
|
相似度四舍五入为整数
|
1 year ago |
|
DELL
|
5f1010e502
|
动态列保存用户勾选字段接口修改
|
1 year ago |
|
sunchenliang
|
c993e89ceb
|
修改任务包详情
|
1 year ago |
|
DELL
|
986409a500
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
DELL
|
e00644e22f
|
审核左侧列表查询，新增返回字段，审批状态和提报人姓名
|
1 year ago |
|
shuliYao
|
c8501e6be2
|
feat: 无量云数据拉取、相似度列表查询
1.无量云数据拉取增加访问部门、修复项目名称字段放错问题
2.修复相似度列表查询 分页不生效问题
|
1 year ago |
|
sunchenliang
|
2fd4a6e9ef
|
修改终审列表
|
1 year ago |
|
sunchenliang
|
b96354b5f0
|
修改任务包详情添加审查记录
|
1 year ago |
|
lzCodeGarden
|
15847e37d8
|
修复linux地址路径截取
|
1 year ago |
|
lzCodeGarden
|
99d9be6429
|
修复缩略图名称获取错误
|
1 year ago |
|
lzCodeGarden
|
deabcea411
|
配置文件数据库更改，后端页面路径指向
|
1 year ago |
|
lzCodeGarden
|
542c9e10c1
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
lzCodeGarden
|
a806630cbc
|
新增缩略图
|
1 year ago |
|
sunchenliang
|
92444d64b7
|
修改任务单任务详情-相似图片列表
|
1 year ago |
|
ljt
|
5b9a213668
|
综合搜索接口已修改
|
1 year ago |
|
sunchenliang
|
38e682da0c
|
修改任务单任务详情-相似图片列表
|
1 year ago |
|
DELL
|
c41d921dc4
|
动态列查询，原型图每个页面必选字段不一样，原来查询的是必选字段或类型匹配的字段，暂时修改查询方式为：只根据类型匹配查询
|
1 year ago |
|
shuliYao
|
96c0716bf6
|
feat: 解决dev-yml缺少参数，解决图片数据处理项目名称赋值错误问题
|
1 year ago |
|
lzCodeGarden
|
794bf19811
|
配置文件数据库更改，后端页面路径指向
|
1 year ago |
|
lzCodeGarden
|
e1186d6fda
|
配置文件数据库更改，后端页面路径指向
|
1 year ago |
|
lzCodeGarden
|
a16abc330b
|
更新比对
|
1 year ago |
|
lzCodeGarden
|
137790a115
|
图片比对优化
|
1 year ago |
|
ljt
|
188ef2019c
|
任务清除标记 没清除标记 已修改bug
|
1 year ago |
|
sunchenliang
|
4bde6ffd72
|
修改任务审批及任务包详情添加审查日志
|
1 year ago |
|
sunchenliang
|
c58a6123ac
|
修改任务审批列表数据重复
|
1 year ago |
|
shuliYao
|
77e3f69c10
|
feat: 审核任务列表(包含历史审批) id为long导致丢失精度问题修改
|
1 year ago |
|
sunchenliang
|
76a120a10c
|
修改任务包相关接口
|
1 year ago |
|
sunchenliang
|
4ac99767b1
|
修改任务包相关接口
|
1 year ago |
|
sunchenliang
|
ee36909fc3
|
修改图片相似度检测
|
1 year ago |
|
sunchenliang
|
2afc9f89c2
|
修改图片本地化存储
|
1 year ago |
|
DELL
|
974e61e0ad
|
动态列->>保存用户勾选字段列表和查询用户勾选字段列表->>增加固定列和非固定列字段
|
1 year ago |
|
lijingtao
|
91f5537b35
|
消息接口清除 修改bug
|
1 year ago |
|
lijingtao
|
44623e8c06
|
ai统计接口增加 少提交一个
|
1 year ago |
|
sunchenliang
|
6b10a0ac43
|
Merge branch 'dev'
# Conflicts:
# jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java
# runstart/src/main/resources/application-dev.yml
|
1 year ago |
|
sunchenliang
|
aa2ea3a0dd
|
修改图片本地化存储及一键查重功能
|
1 year ago |
|
lijingtao
|
7e667bbf9f
|
消息列表修改去掉发送人
ai统计接口增加
|
1 year ago |
|
DELL
|
100ea1e7c7
|
终审列表查询
|
1 year ago |
|
DELL
|
ff01c25373
|
Merge branch 'master' into dev-cui
# Conflicts:
# runstart/src/main/resources/application-dev.yml
|
1 year ago |
|
shuliYao
|
690b0961be
|
feat: 解决图片查询，日期比对不正确问题
|
1 year ago |
|
DELL
|
54ac08208e
|
高级筛选新增类型，自定义筛选新增类型
|
1 year ago |
|
shuliYao
|
6884d69ed2
|
feat: 解决查询包含相似度报错问题，修改检索提报人字段，由名称改为id
|
1 year ago |
|
shuliYao
|
acb62185a8
|
feat: 解决合并冲突遗留问题
|
1 year ago |
admin
|
a7c05737e5
|
新增我的任务接口，查询当前用户的待审批、审批过的任务
|
1 year ago |
|
admin
|
fa6c8b937a
|
Merge branch 'master' of https://git.mcnetmart.com/guoxiangbin/ocr
# Conflicts:
# jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java
|
1 year ago |
|
admin
|
bd13df89b7
|
新增我的任务接口，查询当前用户的待审批、审批过的任务
|
1 year ago |
