feature: 20240403演示版本合并 #66

Merged
yaoshuli merged 161 commits from test into master 1 year ago

161 Commits (master)

Author SHA1 Message Date
yaoshuli a38e43ddb3 Merge pull request 'fix: 任务审核列表补齐返回值信息' (#65) from fix/listalldataComplementResult into test
1 year ago
shuliYao 1392d7c1b0 fix: 补齐参数信息
1 year ago
sunchenliang b95e36ec33 Merge pull request 'fix: 修改相似度列表' (#64) from sunchenliang into test
1 year ago
sunchenliang 718ba4324c fix: 修改相似度列表
1 year ago
sunchenliang c49779459b Merge pull request 'fix: 修改相似度' (#63) from sunchenliang into test
1 year ago
sunchenliang d8294d704b fix: 修改相似度
1 year ago
shuliYao 432ac36346 fix: 解决终审列表报错问题
1 year ago
sunchenliang 78cd6cbc60 Merge pull request 'fix: 终审列表添加排序' (#62) from sunchenliang into test
1 year ago
sunchenliang 1680322a64 fix: 终审列表添加排序
1 year ago
sunchenliang 493e07c2ee Merge pull request 'fix: 任务包主图返回任务id' (#61) from sunchenliang into test
1 year ago
sunchenliang d89a98808f fix: 任务包主图返回任务id
1 year ago
sunchenliang acc3f48cc6 Merge pull request 'fix: 修改终审列表返回及搜索' (#60) from sunchenliang into test
1 year ago
sunchenliang 229e164046 fix: 修改终审列表返回及搜索
1 year ago
sunchenliang 49efcca13b Merge pull request 'sunchenliang' (#59) from sunchenliang into test
1 year ago
sunchenliang 4737149aa5 fix: 修改任务包详情返回taskId
1 year ago
shuliYao 2e919f8b06 fix: 拉取新数据域名代码切换
1 year ago
shuliYao 9b2cd4b1cb fix: 拉取新数据域名代码切换
1 year ago
shuliYao 17258e7adb fix: 数据拉取参数环境调整修改。
1 year ago
LILI 9823f6e2c5 fix:1.图片列表排序字段变更 2.图片查重列表返回阈值重新获取排序 3.可疑文件删除代码优化
1 year ago
LILI b5892c3885 fix:可疑文件删除接口增加非空判断,添加API文档注释
1 year ago
LILI af56654566 fix:1.图片查重页面条件回写接口问题修改
1 year ago
DELL a81625f674 fix:全文检索-工单搜索部分对已删除数据加判断
1 year ago
shuliYao 39ecb23c6b fix: 新数据域名及请求切换
1 year ago
shuliYao 9d72a9a602 fix: 框架定制查询封装bug修改,searchQuery
1 year ago
DELL dd42fa96ad fix:ai统计弹窗,已审批数修改为通过+不通过
1 year ago
lili 010230306b Merge pull request 'fix/userSearch_0402' (#58) from fix/userSearch_0402 into test
1 year ago
LILI 1dc8822518 Merge branch 'test' into fix/userSearch_0402
1 year ago
LILI 26b3453a72 fix:1.图片列表排序字段变更 2.图片查重列表返回阈值重新获取排序 3.可疑文件删除代码优化
1 year ago
lili bf2753f384 Merge pull request 'fix:可疑文件删除接口增加非空判断,添加API文档注释' (#57) from fix/userSearch_0402 into test
1 year ago
LILI fe9ac432e7 fix:可疑文件删除接口增加非空判断,添加API文档注释
1 year ago
shuliYao 507283851a fix: 拉取新数据域名代码切换
1 year ago
shuliYao d18089a7c4 fix: 拉取新数据域名代码切换
1 year ago
shuliYao a42ea9ff39 Merge remote-tracking branch 'origin/test' into test
1 year ago
shuliYao a49b5a8e09 fix: 数据拉取参数环境调整修改。
1 year ago
lili 240735c524 Merge pull request 'fix:1.图片查重页面条件回写接口问题修改' (#56) from fix/userSearch_0402 into test
1 year ago
LILI 70687e9ab5 fix:1.图片查重页面条件回写接口问题修改
1 year ago
cuihaojie db2b97265c Merge pull request 'fix:全文检索-工单搜索部分对已删除数据加判断' (#55) from fix/Full-text_search into test
1 year ago
DELL 1aa84b6ad8 fix:全文检索-工单搜索部分对已删除数据加判断
1 year ago
yaoshuli 7fa45f41e6 Merge pull request 'fix:修复自定义查询封装缺失功能、修改拉取无量云数据接口地址变化问题' (#54) from fix/searchQueryEdit into test
1 year ago
shuliYao 10321f99de fix: 新数据域名及请求切换
1 year ago
shuliYao 7e04e5c23d fix: 框架定制查询封装bug修改,searchQuery
1 year ago
cuihaojie 5976bbbd23 Merge pull request 'fix:ai统计弹窗,已审批数修改为通过+不通过' (#53) from fix/Statistical_popup into test
1 year ago
DELL 120e02786d fix:ai统计弹窗,已审批数修改为通过+不通过
1 year ago
sunchenliang 0aae10cba9 fix: 相似度列表增加缩略图
1 year ago
cuihaojie eeea2fe479 Merge pull request 'fix:测试结束,恢复ai审批工具弹窗原有阈值判断' (#52) from fix/The_judgment_threshold_is_restored into test
1 year ago
DELL 24f36fa020 fix:测试结束,恢复ai审批工具弹窗原有阈值判断
1 year ago
cuihaojie 38730470df Merge pull request 'fix:ai审批工具修改阈值方便测试' (#51) from fix/Example_Modify_the_judgment_threshold into test
1 year ago
DELL b8da26f48e fix:ai审批工具修改阈值方便测试
1 year ago
sunchenliang 63c2980045 Merge pull request 'fix: ai审批列表及相似度列表返回查重信息' (#50) from sunchenliang into test
1 year ago
sunchenliang aee0a37b43 fix: ai审批列表及相似度列表返回查重信息
1 year ago
sunchenliang 719a1885f7 Merge pull request 'sunchenliang' (#49) from sunchenliang into test
1 year ago
sunchenliang 59697db137 Merge remote-tracking branch 'origin/sunchenliang' into sunchenliang
1 year ago
cuihaojie bf71402ac8 Merge pull request 'fix:高级检索的修改先注释掉,SearchQuery类修改的代码不完整,会影响服务运行' (#48) from fix/Task_approval_Advanced_screening_2898 into test
1 year ago
sunchenliang 193ab52f02 fix: ai审批列表及相似度列表返回查重信息
1 year ago
DELL 4e9d6d3345 fix:高级检索的修改先注释掉,SearchQuery类修改的代码不完整,会影响服务运行
1 year ago
sunchenliang 3c40ab3da8 fix: ai审批列表及相似度列表返回查重信息
1 year ago
lili d2da1c988d Merge pull request 'fix/dubious_file_2897' (#46) from fix/dubious_file_2897 into test
1 year ago
LILI c92beb488e Merge branch 'test' into fix/dubious_file_2897
1 year ago
LILI 475cf208c7 fix:1.可疑文件搜索返回相关字段信息处理
1 year ago
shuliYao e94dcb014c Merge remote-tracking branch 'origin/test' into test
1 year ago
shuliYao 13d7eea4a4 fix: 封装代码提交
1 year ago
sunchenliang d2957f6fb9 Merge pull request 'fix: 相似度列表添加图片信息' (#45) from sunchenliang into test
1 year ago
sunchenliang 17a467d3f6 fix: 相似度列表添加图片信息
1 year ago
sunchenliang a615930c35 Merge pull request 'sunchenliang' (#44) from sunchenliang into test
1 year ago
sunchenliang d9066f1115 fix: 任务重复列表修改
1 year ago
sunchenliang 3fbe5ba03c Merge remote-tracking branch 'origin/sunchenliang' into sunchenliang
1 year ago
sunchenliang 740cc6ae47 fix: 任务重复列表修改
1 year ago
sunchenliang f95b910323 fix: 任务重复列表修改
1 year ago
sunchenliang 0798e990f4 fix: 任务重复列表修改
1 year ago
shuliYao 4f2a478f68 fix: 解决任务审核查询报错问题
1 year ago
cuihaojie 5703682b41 Merge pull request 'fix:调整ai审批工具弹窗,相似度为100的为空时,传0' (#42) from fix/advanced_screening_2898 into test
1 year ago
lili cd186235e4 Merge pull request 'fix:1.admin账号后台登录问题 2.可疑文件搜索返回相关字段信息TODO' (#41) from fix/dubious_file_2897 into test
1 year ago
LILI 62c2223213 fix:1.admin账号后台登录问题 2.可疑文件搜索返回相关字段信息TODO
1 year ago
DELL 0d0ee047ca fix:调整ai审批工具弹窗,相似度为100的为空时,传0
1 year ago
lili 3db9b614d1 Merge pull request 'fix:1.综合搜索菜单模块权限过滤,2.历史搜索租户数据权限过滤' (#40) from fix/dubious_file_2897 into test
1 year ago
shuliYao 2883921cd4 fix: 解决图片查询、终审查询,选择项目后不生效问题
1 year ago
LILI daad7b874f fix:1.综合搜索菜单模块权限过滤,2.历史搜索租户数据权限过滤
1 year ago
cuihaojie 45600563f5 Merge pull request 'fix:调整ai统计弹窗,复用/flow/task/listalldata接口的查询方法' (#39) from fix/ai_statistics_2896 into test
1 year ago
DELL 5244be57f7 fix:调整ai统计弹窗,复用/flow/task/listalldata接口的查询方法
1 year ago
cuihaojie 2c85c8d93b Merge pull request 'fix:修改ai审批工具弹窗接口,审批节点不需要前端传递' (#38) from fix/one-click_pop-up_window_2898 into test
1 year ago
DELL a772b8859b fix:修改ai审批工具弹窗接口,审批节点不需要前端传递
1 year ago
shuliYao 4f50317ec6 fix: 解决查重结果返回排序问题
1 year ago
shuliYao 143922c5f9 fix: 图审相似度主图查询,排序规则改变
1 year ago
yaoshuli 6040528bc4 Merge pull request 'feat: 图审相似度列表接口,增加相似度分组排序' (#37) from feature/taskPageSimilarityGroupOrder into test
1 year ago
shuliYao 77110f5ffa feat: 图审相似度列表接口,增加相似度分组排序
1 year ago
sunchenliang ae20c76a1c Merge pull request 'fix: 相似度列表添加任务信息' (#36) from sunchenliang into test
1 year ago
sunchenliang 425ac204f6 fix: 相似度列表添加任务信息
1 year ago
sunchenliang 0342cdcbea Merge pull request 'sunchenliang' (#35) from sunchenliang into test
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 c43e96a65c Merge pull request 'sunchenliang' (#33) from sunchenliang into test
1 year ago
sunchenliang e0e5d9863a fix: 修改任务包列表
1 year ago
cuihaojie bbcc920d63 Merge pull request 'fix:调整一键查重和图审审批弹窗接口' (#32) from fix/approvalToolPopupNew into test
1 year ago
DELL 3221541f58 fix:调整一键查重和图审审批弹窗接口
1 year ago
lili 305e96c3be Merge pull request 'dev-lili-330' (#31) from dev-lili-330 into test
1 year ago
LILI 91e68fc2ce Merge branch 'test' into dev-lili-330
1 year ago
LILI ef1b3d4c02 fix:1.查重任务添加可以文件判断过滤
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
1 year ago
sunchenliang 10c4288243 fix: 修改任务审批筛选
1 year ago
cuihaojie 139090358b Merge pull request 'fix:修改ai审批工具接口,未修改完整,因为需要拉代码拿一个新增接口,所以先暂时提交部分代码' (#29) from fix/aiApprovalToolPopup into test
1 year ago
DELL 244d922752 fix:修改ai审批工具接口,未修改完整,因为需要拉代码拿一个新增接口,所以先暂时提交部分代码
1 year ago
sunchenliang 002890a4e4 Merge pull request 'sunchenliang' (#28) from sunchenliang into test
1 year ago
shuliYao 950ac308df fix: 解决查重时因为某张图片没有下载到本地,导致查重任务异常问题
1 year ago
sunchenliang 18389bd9b5 Merge remote-tracking branch 'origin/test' into sunchenliang
1 year ago
sunchenliang 91cd05ac83 fix: 任务包列表添加是否删除标识,增加查询图片节点状态接口
1 year ago
sunchenliang 84347984b3 Merge pull request 'fix: 1.修改小结查重返回参数' (#25) from sunchenliang into test
1 year ago
sunchenliang 909e625575 fix: 1.修改小结查重返回参数
1 year ago
sunchenliang 0748b452bf Merge pull request 'fix: 1.修改小结查重返回参数' (#24) from sunchenliang into test
1 year ago
sunchenliang 23ec8ab108 fix: 1.修改小结查重返回参数
1 year ago
cuihaojie c0dee71196 Merge pull request 'fix:修改ai审批工具接口,调整查询表和返回数据' (#23) from fix/aiApprovalTool into test
1 year ago
DELL 0ccbf8bbfc fix:修改ai审批工具接口,调整查询表和返回数据
1 year ago
sunchenliang a31e94d28e Merge pull request 'fix: 1.修改小结查重2.修改创建任务' (#22) from sunchenliang into test
1 year ago
sunchenliang b8721bd84a fix: 1.修改小结查重2.修改创建任务
1 year ago
lili 9d5d167f03 Merge pull request 'dev-lili-330' (#21) from dev-lili-330 into test
1 year ago
LILI b23b54cb78 Merge branch 'test' into dev-lili-330
1 year ago
LILI 383d28870e fix:1.代码合并问题
1 year ago
cuihaojie e4c9aea585 Merge pull request 'fix:ai统计接口去掉24小时限制' (#20) from fix/aiStatistics into test
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
1 year ago
LILI 22a78f1c07 Merge branch 'test' into dev-lili-330
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
1 year ago
shuliYao a151f9047a feature: 增加业务字典,根据value反差label接口。
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 611f07687d Merge pull request 'fix:测试ai统计接口,调整获取验证码_当天最多发送10条_缓存时间调整为24小时' (#15) from fix/aiStatistics_2825_2826 into test
1 year ago
DELL 2bb50bf2dc fix:测试ai统计接口,调整获取验证码_当天最多发送10条_缓存时间调整为24小时
1 year ago
cuihaojie da6156c425 Merge pull request 'fix:修改忘记密码_修改密码模块,符合修改密码策略' (#14) from fix/forgotPassword_2727 into test
1 year ago
DELL 94e26c88fd fix:修改忘记密码_修改密码模块,符合修改密码策略
1 year ago
sunchenliang 5c110b5df3 Merge pull request 'fix: 完善任务详情信息' (#13) from sunchenliang into test
1 year ago
sunchenliang 76b7df199d fix: 完善任务详情信息
1 year ago
sunchenliang 96617e1525 Merge pull request 'fix: 任务启动添加提报日期' (#12) from sunchenliang into test
1 year ago
sunchenliang 322be423b9 fix: 任务启动添加提报日期
1 year ago
sunchenliang 829a0aa97f Merge pull request 'fix: 修改任务审批监听' (#11) from sunchenliang into test
1 year ago
sunchenliang 22c7810274 fix: 修改任务审批监听
1 year ago
cuihaojie ebc9a535f3 Merge pull request 'fix:修改账号密码登录模块,在输入错误的企业编码、账号、密码时,弹出对应的提示信息' (#10) from fix/loginErrorCheck_2783 into test
1 year ago
DELL dba60ff044 fix:修改账号密码登录模块,在输入错误的企业编码、账号、密码时,弹出对应的提示信息
1 year ago
cuihaojie 92829980b2 Merge pull request 'fix:修改短信登录模块_手机号正确的情况下提示用户错误的bug' (#9) from fix/smsLogin_2782 into test
1 year ago
DELL 968740acfa fix:修改短信登录模块_手机号正确的情况下提示用户错误的bug
1 year ago
sunchenliang f7ce84d86d Merge pull request 'fix: 修改获取用户信息及任务包接口' (#8) from sunchenliang into test
1 year ago
sunchenliang 5f1bc17a5c fix: 修改获取用户信息及任务包接口
1 year ago
cuihaojie a68d23aafa Merge pull request 'fix:工具类修改时间格式,我的终审列表查询_时间查询_修改时间格式' (#7) from fix/timeToolClassModification into test
1 year ago
DELL a235b507d4 fix:工具类修改时间格式,我的终审列表查询_时间查询_修改时间格式
1 year ago
yaoshuli 86610ec292 Merge pull request 'feature:修改图片识别水印模块' (#6) from feature/pictureWatermarkAnalysis_2761 into test
1 year ago
DELL 957883d0a3 feature:修改图片识别水印模块
1 year ago
cuihaojie f584b635fe Merge pull request 'fix:修改短信验证码模块,限制当天验证码最多发送十次' (#5) from feature/verificationCodeLimitingFrequency_2724 into test
1 year ago
DELL 3ad65bf5a6 修改短信验证码模块,限制当天验证码最多发送十次
1 year ago
sunchenliang 6f0bb8fce8 Merge pull request 'refactor:修改相似度列表' (#4) from sunchenliang into test
1 year ago
sunchenliang 9cb6c446b2 refactor/1.修改相似度列表
1 year ago
yaoshuli 2cfb8b86e8 Merge pull request 'fix: 解决图片查询接口,时间、图片相似度排序bug问题' (#3) from fix/pictrueListOrderBug_2676 into test
1 year ago
shuliYao 144df64bd0 fix: 解决图片查询接口,时间、图片相似度排序bug问题
1 year ago
yaoshuli b51d6bbc04 Merge pull request 'fix: 修复图片查询,阈值区间比对不正确问题' (#2) from fix/queryPictureByIzsimilarityNull into test
1 year ago
sunchenliang f7cf61567b refactor(修改任务包列表):修改任务包列表增加全量筛选项
1 year ago
shuliYao e86ff9f8fc fix: 修复图片查询,阈值区间比对不正确问题
1 year ago
shuliYao 7e9c134a91 docs: 演示修改
1 year ago