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

12 Jan, 2022 7 commits
- Merge branch 'feature/01-10' into developer · 5d527d73
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/StaffMapper.java
#	haoban-manage3-service/src/main/resources/mapper/StaffMapper.xml
```
  墨竹 authored Jan 12, 2022
  5d527d73 Browse Files
- feat：通讯录同步bug修改 · a13a9080
  墨竹 authored Jan 12, 2022
  
  a13a9080 Browse Files
- feat：通讯录同步bug修改 · 342d465e
  墨竹 authored Jan 12, 2022
  
  342d465e Browse Files
- fix:逾期状态类型 · 5dff9390
  fudahua authored Jan 12, 2022
  
  5dff9390 Browse Files
- fix:逾期状态类型 · b85f2bcf
  fudahua authored Jan 12, 2022
  
  b85f2bcf Browse Files
- fix:逾期状态类型 · 49d0b047
  fudahua authored Jan 12, 2022
  
  49d0b047 Browse Files
- feat：增加枚举 · ef8a1e69
  墨竹 authored Jan 12, 2022
  
  ef8a1e69 Browse Files
11 Jan, 2022 6 commits
- Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 into developer · 4327c8f8
  fudahua authored Jan 11, 2022
  
  4327c8f8 Browse Files
- fix:去重 · 4ae5e655
  fudahua authored Jan 11, 2022
  
  4ae5e655 Browse Files
- refactor：增加返回字段 · 76743a0f
  墨竹 authored Jan 11, 2022
  
  76743a0f Browse Files
- refactor：增加dubbo · 4f351559
  墨竹 authored Jan 11, 2022
  
  4f351559 Browse Files
- refactor：增加dubbo · f15c4917
  墨竹 authored Jan 11, 2022
  
  f15c4917 Browse Files
- refactor：删除无效代码 · b42f9728
  墨竹 authored Jan 11, 2022
  
  b42f9728 Browse Files
10 Jan, 2022 7 commits
- feat:新增几个代表全部类型以及消息类型 · 2b657588
  fudahua authored Jan 10, 2022
  
  2b657588 Browse Files
- Merge branch 'feature/01-10' into developer · c883ddbd
  墨竹 authored Jan 10, 2022
  
  c883ddbd Browse Files
- fix：更改日志 · 66441658
  墨竹 authored Jan 10, 2022
  
  66441658 Browse Files
- 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 13 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