Commit Graph

768 Commits (d4042d234edf83b75153a15a0f6f8bdd4abf1fb5)
 

Author SHA1 Message Date
raofuzi d4042d234e Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/suspiciousSort
1 year ago
raofuzi ce25698eb8 feat: 修改bug
1 year ago
zhouxiaoan 356e897bce Merge branch 'fix/20240412bug' into test
1 year ago
raoyongjun 93ffdeed71 Merge pull request 'feat: 修改bug' (#175) from fix/suspiciousSort into test
1 year ago
raofuzi 6be68c72a5 Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/suspiciousSort
1 year ago
raofuzi 3e0158679f feat: 修改bug
1 year ago
zhouxiaoan 037f5d30d0 fix: 合并test分支处理冲突
1 year ago
贾博轩 2256b416ac Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into test
1 year ago
贾博轩 40ca137203 feat: 解决逻辑冲突问题
1 year ago
zhouxiaoan cd42a5bc40 fix: 合并test分支处理冲突
1 year ago
刘释隆 75e1c098b7 Merge pull request 'fix: 回滚样式并调整字段取值' (#174) from fix/error_ui into test
1 year ago
刘释隆 257ebca62b fix: 回滚样式并调整字段取值
1 year ago
zhouxiaoan 878a81a355 fix: 处理图鉴管理布局样式
1 year ago
raoyongjun 5a0d4e8b0a Merge pull request 'fix/suspiciousSort' (#173) from fix/suspiciousSort into test
1 year ago
raofuzi f5cc60e423 feat: 修改bug
1 year ago
raofuzi 39e4d383fe feat: 修改bug
1 year ago
raofuzi 6ce50b5d33 feat: 修改bug
1 year ago
赵辉 68eee1a809 Merge pull request 'fix:箭头的选中状态' (#172) from fix/change_task into test
1 year ago
lihui_ocr 732d41db11 fix:箭头的选中状态
1 year ago
赵辉 9dc782de7f Merge pull request 'fix:修改沉浸模式样式' (#171) from fix/change_task into test
1 year ago
lihui_ocr eec8ad7573 fix:修改沉浸模式样式
1 year ago
贾博轩 43d15cfdcf feat: 新增最后审批查找功能
1 year ago
贾博轩 cc6f0ce4c1 Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into test
1 year ago
贾博轩 995dad8723 feat: 修改消息列表审批通知等功能
1 year ago
刘释隆 ca6fb53d08 Merge pull request 'feat/select_change' (#170) from feat/select_change into test
1 year ago
刘释隆 79596247f1 Merge branch 'test' into feat/select_change
1 year ago
刘释隆 acd661ffd2 feat: 任务审批逻辑修改及图审主图展示适配
1 year ago
raoyongjun fe50821c30 Merge pull request 'fix/suspiciousSort' (#168) from fix/suspiciousSort into test
1 year ago
raofuzi 00ec4dd402 feat: 修改bug
1 year ago
raofuzi 663afdaf5e feat: 修改bug
1 year ago
赵辉 1304f3365d Merge pull request 'feat:位置信息加标签' (#167) from fix/change_task into test
1 year ago
lihui_ocr ff103fe611 位置信息加标签
1 year ago
赵辉 303a8b0f90 Merge pull request 'FIX:第四次审批样式修改' (#166) from fix/change_task into test
1 year ago
lihui_ocr 1e041144b8 FIX:第四次审批样式修改
1 year ago
刘释隆 f50f8ac87b Merge pull request 'feat: 任务审批自定义字段逻辑修改及图审主图ui修改' (#165) from feat/ui_task_update into test
1 year ago
刘释隆 6ad5e1f158 feat: 任务审批自定义字段逻辑修改及图审主图ui修改
1 year ago
贾博轩 afa388f6eb feat: 合并test分支内容到jia
1 year ago
zhouxiaoan 8aa1090229 Merge pull request 'fix: 处理图鉴管理布局错误' (#164) from fix/20240412bug into test
1 year ago
zhouxiaoan b80d9edef4 fix: 处理图鉴管理布局错误
1 year ago
raofuzi 28dde2bfa4 Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/suspiciousSort
1 year ago
刘释隆 7e34bf0440 Merge pull request 'fix: 修复打包时报错问题' (#163) from fix/import_error into test
1 year ago
刘释隆 bb68446e6a fix: 修复打包时报错问题
1 year ago
刘释隆 52e92a391c Merge pull request 'feat: 高级筛选样式修改' (#162) from feat/ui_error_superSearch into test
1 year ago
刘释隆 128ed694cf feat: 高级筛选样式修改
1 year ago
zhouxiaoan 9ff0959153 fix: 合并代码处理冲突
1 year ago
zhouxiaoan daf79405c1 Merge pull request 'fix:20240410bug修复' (#154) from fix/modifyStyle into test
1 year ago
zhouxiaoan 38a43bed83 fix: 合并代码处理冲突
1 year ago
raofuzi 939a7344c8 Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/suspiciousSort
1 year ago
raofuzi ab88ad3e68 feat: 修改bug
1 year ago
zhouxiaoan 6c734d297c fix:
1 year ago