Commits · 5b086c29e2659bc04e510fce97a136720eced364 · haoban3.0 / haoban-manage3.0 · GitLab

30 Dec, 2021 2 commits
- 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
29 Dec, 2021 3 commits
- Merge branch 'master' into developer · 773c1844
  墨竹 authored Dec 29, 2021
  
  773c1844 Browse Files
- Merge remote-tracking branch 'origin/master' · 326ef050
  墨竹 authored Dec 29, 2021
  
  326ef050 Browse Files
- feat：bug修改 · b3636fa9
  墨竹 authored Dec 29, 2021
  
  b3636fa9 Browse Files
27 Dec, 2021 14 commits
- fix:bug修改 · 4e95d96d
  墨竹 authored Dec 27, 2021
  
  4e95d96d Browse Files
- fix：是否展示会员工具bug修改 · 0c8ebb86
  墨竹 authored Dec 27, 2021
  
  0c8ebb86 Browse Files
- Merge branch 'master' into developer · fb72d7b1
```
# Conflicts:
#	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
```
  墨竹 authored Dec 27, 2021
  fb72d7b1 Browse Files
- fix：是否展示会员工具bug修改 · ffb1d513
  墨竹 authored Dec 27, 2021
  
  ffb1d513 Browse Files
- fix: 审核 · b5b59548
  fudahua authored Dec 27, 2021
  
  b5b59548 Browse Files
- fix: 发送消息 · 217b4cba
  fudahua authored Dec 27, 2021
  
  217b4cba Browse Files
- fix: 拒绝空指针 · 65a49be8
  fudahua authored Dec 27, 2021
  
  65a49be8 Browse Files
- fix: 拒绝空指针 · c54572d8
  fudahua authored Dec 27, 2021
  
  c54572d8 Browse Files
- feat：消息通知支持staffId · cd8b86c2
  fudahua authored Dec 27, 2021
  
  cd8b86c2 Browse Files
- feat：消息通知支持staffId · 5ab4953a
  fudahua authored Dec 27, 2021
  
  5ab4953a Browse Files
- feat：消息通知支持staffId · 31bb3b48
  fudahua authored Dec 27, 2021
  
  31bb3b48 Browse Files
- feat：消息 · db3f18ca
  fudahua authored Dec 27, 2021
  
  db3f18ca Browse Files
- Merge branch 'developer' into feature-daiban-12-14 · 2496208d
  fudahua authored Dec 27, 2021
  
  2496208d Browse Files
- feat：消息 · 73ce6248
  fudahua authored Dec 27, 2021
  
  73ce6248 Browse Files
24 Dec, 2021 3 commits
- feat：登录跳过 · f2c032d5
  墨竹 authored Dec 24, 2021
  
  f2c032d5 Browse Files
- Merge branch 'developer' into feature-daiban-12-14 · 9b04e32a
  fudahua authored Dec 24, 2021
  
  9b04e32a Browse Files
- Merge branch 'master' into developer · 8e053b65
  fudahua authored Dec 24, 2021
  
  8e053b65 Browse Files
23 Dec, 2021 18 commits
- feat：增加登录流程 · 46719b7b
  墨竹 authored Dec 24, 2021
  
  46719b7b Browse Files
- feat：会员登录bug修改 · b8863ea1
  墨竹 authored Dec 23, 2021
  
  b8863ea1 Browse Files
- feat：会员登录bug修改 · 4fee465e
  墨竹 authored Dec 23, 2021
  
  4fee465e Browse Files
- feat：会员登录bug修改 · 9834e78d
  墨竹 authored Dec 23, 2021
  
  9834e78d Browse Files
- feat：bug修改 · ae38c343
  墨竹 authored Dec 23, 2021
  
  ae38c343 Browse Files
- Merge branch 'developer' into feature-daiban-12-14 · c7415249
  fudahua authored Dec 23, 2021
  
  c7415249 Browse Files
- 消息推送 · 8b12680e
  fudahua authored Dec 23, 2021
  
  8b12680e Browse Files
- 消息推送 · af156b67
  fudahua authored Dec 23, 2021
  
  af156b67 Browse Files
- Merge branch 'feature/login-token' into developer · f20ceb5f
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/AuditApiServiceImpl.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffDepartmentRelatedApiServiceImpl.java
```
  fudahua authored Dec 23, 2021
  f20ceb5f Browse Files
- feat：推送兼容 · 375e1aa8
  墨竹 authored Dec 23, 2021
  
  375e1aa8 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 45c3f7ba
  fudahua authored Dec 23, 2021
  
  45c3f7ba Browse Files
- Merge branch 'feature-daiban-12-14' into developer · 9e9184cd
  fudahua authored Dec 23, 2021
  
  9e9184cd Browse Files
- 消息推送 · e7588d5c
  fudahua authored Dec 23, 2021
  
  e7588d5c Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · c7d838bf
  xugaojun authored Dec 23, 2021
  
  c7d838bf Browse Files
- [fix]：任务完成报错修复 · 7b4755d5
  xugaojun authored Dec 23, 2021
  
  7b4755d5 Browse Files
- 消息推送-枚举 · dd107e21
  fudahua authored Dec 23, 2021
  
  dd107e21 Browse Files
- Merge branch 'feature-daiban-12-14' into developer · 837bce94
  fudahua authored Dec 23, 2021
  
  837bce94 Browse Files
- 消息推送-枚举 · 8ec34c32
  fudahua authored Dec 23, 2021
  
  8ec34c32 Browse Files