Commits · c4f9e4ea752345aacd5b1791ec9c92a13c43627d · haoban3.0 / haoban-manage3.0 · GitLab

10 Jan, 2022 4 commits
- Merge branch 'feature/01-10' into developer · c4f9e4ea
  墨竹 authored Jan 10, 2022
  
  c4f9e4ea Browse Files
- fix：bug修改 · 13d057a5
  墨竹 authored Jan 10, 2022
  
  13d057a5 Browse Files
- Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 into developer · 6910b7a3
  墨竹 authored Jan 10, 2022
  
  6910b7a3 Browse Files
- fix：新增设置对外密钥 · 4667b7a9
  墨竹 authored Jan 10, 2022
  
  4667b7a9 Browse Files
07 Jan, 2022 1 commit
- 推送 · b6b084dd
  fudahua authored Jan 07, 2022
  
  b6b084dd Browse Files
06 Jan, 2022 3 commits
- fix：允许跨域 · 9e94e252
  墨竹 authored Jan 06, 2022
  
  9e94e252 Browse Files
- fix：允许跨域 · 902c952a
  墨竹 authored Jan 06, 2022
  
  902c952a Browse Files
- fix：更改拦截器，删除无效拦截器 · 170f6d9a
  墨竹 authored Jan 06, 2022
  
  170f6d9a Browse Files
05 Jan, 2022 3 commits
- Merge remote-tracking branch 'origin/developer' into developer · af04cee1
  墨竹 authored Jan 05, 2022
  
  af04cee1 Browse Files
- Merge branch 'feature/2022-0104' into developer · 76f36682
  墨竹 authored Jan 05, 2022
  
  76f36682 Browse Files
- fix：加好友修改 · da9bb241
  墨竹 authored Jan 05, 2022
  
  da9bb241 Browse Files
04 Jan, 2022 20 commits
- Merge branch 'master' into developer · 0b84704e
  墨竹 authored Jan 05, 2022
  
  0b84704e Browse Files
- fix:bug修改 · b37229f3
  墨竹 authored Jan 04, 2022
  
  b37229f3 Browse Files
- fix:bug修改 · 2a723934
  墨竹 authored Jan 04, 2022
  
  2a723934 Browse Files
- fix:bug修改 · 068d8aae
  墨竹 authored Jan 04, 2022
  
  068d8aae Browse Files
- Merge branch 'feature/2022-0104' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 · b4f13091
  墨竹 authored Jan 04, 2022
  
  b4f13091 Browse Files
- Merge branch 'feature/2022-0104' into developer · 85e7d1db
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/ExternalClerkRelatedApiServiceImpl.java
```
  墨竹 authored Jan 04, 2022
  85e7d1db Browse Files
- refactor：增加钉钉消息 · 2b177dac
  墨竹 authored Jan 04, 2022
  
  2b177dac Browse Files
- Merge branch 'feature/2022-0104' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 · 2c3c520e
  墨竹 authored Jan 04, 2022
  
  2c3c520e Browse Files
- Merge branch 'feature/2022-0104' into developer · aaab3db4
  墨竹 authored Jan 04, 2022
  
  aaab3db4 Browse Files
- refactor：转换失败状态变化 · a4252645
  墨竹 authored Jan 04, 2022
  
  a4252645 Browse Files
- Merge branch 'feature/2022-0104' into developer · 20146461
  墨竹 authored Jan 04, 2022
  
  20146461 Browse Files
- refactor：增加redis锁 · b4bfa3f9
  墨竹 authored Jan 04, 2022
  
  b4bfa3f9 Browse Files
- Merge branch 'master' into developer · dfed5bdc
  墨竹 authored Jan 04, 2022
  
  dfed5bdc Browse Files
- refactor：加日志 · 52b6b6c5
  墨竹 authored Jan 04, 2022
  
  52b6b6c5 Browse Files
- Merge branch 'feature-daiban-12-14' into developer · 0e78f552
  墨竹 authored Jan 04, 2022
  
  0e78f552 Browse Files
- feat：新增获取员工二维码和openid · 12ddd85b
  墨竹 authored Jan 04, 2022
  
  12ddd85b Browse Files
- Merge branch 'feature-daiban-12-14' into developer · 2b66452b
  墨竹 authored Jan 04, 2022
  
  2b66452b Browse Files
- feat：新增获取员工二维码和openid · e9c1f988
  墨竹 authored Jan 04, 2022
  
  e9c1f988 Browse Files
- Merge branch 'feature/2022-0104' into developer · b6d3dee0
  墨竹 authored Jan 04, 2022
  
  b6d3dee0 Browse Files
- fix：bug修改 · 6d569a98
  墨竹 authored Jan 04, 2022
  
  6d569a98 Browse Files
31 Dec, 2021 2 commits
- Merge branch 'feature/2022-0104' into developer · 2db46dc0
  墨竹 authored Dec 31, 2021
  
  2db46dc0 Browse Files
- feat：新增列表返回转换状态 · c5bab88f
  墨竹 authored Dec 31, 2021
  
  c5bab88f Browse Files
30 Dec, 2021 7 commits
- Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 into developer · 137bb03b
  墨竹 authored Dec 30, 2021
  
  137bb03b Browse Files
- Merge branch 'feature-daiban-12-14' into developer · 7616f1fb
  墨竹 authored Dec 30, 2021
  
  7616f1fb Browse Files
- Merge branch 'feature/2022-0104' into developer · 5b086c29
```
# Conflicts:
#	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/ExternalClerkRelatedApiService.java
```
  墨竹 authored Dec 30, 2021
  5b086c29 Browse Files
- feat：新增转换外部联系人接口和转换外部联系人完成接口 · 7bfdb59a
  墨竹 authored Dec 30, 2021
  
  7bfdb59a Browse Files
- feat:逾期失效查询过滤以及筛选 · f734f942
  fudahua authored Dec 30, 2021
  
  f734f942 Browse Files
- feat:待办新增接口 · dbd0be22
  fudahua authored Dec 30, 2021
  
  dbd0be22 Browse Files
- Merge branch 'feature-daiban-12-14' into 'developer' · 1310ae2c
```
feat:逾期失效任务不展示

See merge request !151
```
  fudahua authored Dec 30, 2021
  1310ae2c Browse Files