feature/gitPush_dept #109

Merged

yaoshuli merged 5 commits from feature/gitPush_dept into test

yaoshuli commented

Collaborator

1.张勇工作流权限组部分代码

yaoshuli added 5 commits

acab202aba 修改工作流审批组权限

f46e87214d 修改工作流审批组权限

2ed192854f Merge branch 'test' into feature/gitPush_dept

# Conflicts:
#	jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java

c7b1ff6efc Merge branch 'test' into feature/gitPush_dept

# Conflicts:
#	jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java

e6c7b87a8e fix: 解决配置文件删除字段，导致获取无量云接口错误

yaoshuli merged commit 38ea9bc78f into test 1 year ago

yaoshuli deleted branch feature/gitPush_dept

yaoshuli referenced this issue from a commit

Merge pull request 'feature/gitPush_dept' (#109) from feature/gitPush_dept into test

The pull request has been merged as 38ea9bc78f.

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#109