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

01 Jun, 2020 1 commit
- fix · 0a9db221
  qwmqiuwenmin authored Jun 01, 2020
  
  0a9db221 Browse Files
05 Jun, 2019 1 commit
- Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer · abf80708
  qwmqiuwenmin authored Jun 05, 2019
  
  abf80708 Browse Files
05 Jun, 2020 3 commits
- 全部部门 · c517a78f
  fudahua authored Jun 05, 2020
  
  c517a78f Browse Files
- fix · f5f27544
  qwmqiuwenmin authored Jun 05, 2020
  
  f5f27544 Browse Files
- fix · 9e9e8faa
  qwmqiuwenmin authored Jun 05, 2020
  
  9e9e8faa Browse Files
04 Jun, 2020 30 commits
- fix · e9ca0c1b
  qwmqiuwenmin authored Jun 04, 2020
  
  e9ca0c1b Browse Files
- 11 · 8f2e0a27
  huangZW authored Jun 04, 2020
  
  8f2e0a27 Browse Files
- fix · db003120
  qwmqiuwenmin authored Jun 04, 2020
  
  db003120 Browse Files
- 应用模板 · b7a0a92e
  qwmqiuwenmin authored Jun 04, 2020
  
  b7a0a92e Browse Files
- 111 · 4f941016
  huangZW authored Jun 04, 2020
  
  4f941016 Browse Files
- Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer · 906de071
  huangZW authored Jun 04, 2020
  
  906de071 Browse Files
- 111 · ab5f9f22
  huangZW authored Jun 04, 2020
  
  ab5f9f22 Browse Files
- 全部部门 · daa06492
  fudahua authored Jun 04, 2020
  
  daa06492 Browse Files
- 111 · 2bd1fd1e
  huangZW authored Jun 04, 2020
  
  2bd1fd1e Browse Files
- Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer · 01c76d49
  huangZW authored Jun 04, 2020
  
  01c76d49 Browse Files
- 111 · 79dab2a2
  huangZW authored Jun 04, 2020
  
  79dab2a2 Browse Files
- pay支付接口 · bf8bb2d3
  fudahua authored Jun 04, 2020
  
  bf8bb2d3 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 40052939
  fudahua authored Jun 04, 2020
  
  40052939 Browse Files
- pay支付接口 · ed317973
  fudahua authored Jun 04, 2020
  
  ed317973 Browse Files
- Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer · 8e38029c
  qwmqiuwenmin authored Jun 04, 2020
  
  8e38029c Browse Files
- fix · 3ffb0f37
  qwmqiuwenmin authored Jun 04, 2020
  
  3ffb0f37 Browse Files
- 111 · 57f79eec
  huangZW authored Jun 04, 2020
  
  57f79eec Browse Files
- 111 · 2aedc85d
  huangZW authored Jun 04, 2020
  
  2aedc85d Browse Files
- Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer · d6ccd374
  qwmqiuwenmin authored Jun 04, 2020
  
  d6ccd374 Browse Files
- fix · 629384ae
  qwmqiuwenmin authored Jun 04, 2020
  
  629384ae Browse Files
- Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer · 5434f825
  huangZW authored Jun 04, 2020
  
  5434f825 Browse Files
- Merge branch 'developer' of · 980dfb9a
```
http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffClerkRelationApiServiceImpl.java
```
  huangZW authored Jun 04, 2020
  980dfb9a Browse Files
- 111 · d934ee9b
  huangZW authored Jun 04, 2020
  
  d934ee9b Browse Files
- fix · a196003e
  qwmqiuwenmin authored Jun 04, 2020
  
  a196003e Browse Files
- 外部联系人需要调整 · 876afa7a
  qwmqiuwenmin authored Jun 04, 2020
  
  876afa7a Browse Files
- fix · c954244f
  qwmqiuwenmin authored Jun 04, 2020
  
  c954244f Browse Files
- fix · a2aca17e
  qwmqiuwenmin authored Jun 04, 2020
  
  a2aca17e Browse Files
- fix · 8f93c591
  qwmqiuwenmin authored Jun 04, 2020
  
  8f93c591 Browse Files
- fix · 9e4e5610
  qwmqiuwenmin authored Jun 04, 2020
  
  9e4e5610 Browse Files
- fix · a7396644
  qwmqiuwenmin authored Jun 04, 2020
  
  a7396644 Browse Files
03 Jun, 2020 5 commits
- Merge branch 'master-6-3' into developer · ea811b1d
  fudahua authored Jun 03, 2020
  
  ea811b1d Browse Files
- secret接口更改 · feb0e502
  fudahua authored Jun 03, 2020
  
  feb0e502 Browse Files
- Merge branch 'master-6-3' into developer · 35fcf927
  fudahua authored Jun 03, 2020
  
  35fcf927 Browse Files
- Merge branch 'master' into developer · 7105393b
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffDepartmentRelatedApiServiceImpl.java
```
  fudahua authored Jun 03, 2020
  7105393b Browse Files
- secret接口更改 · eabcf188
  fudahua authored Jun 03, 2020
  
  eabcf188 Browse Files