Commits · 30bb99da816097625023ff01d2b307ee7c40de30 · haoban3.0 / haoban-manage3.0 · GitLab

08 Apr, 2020 23 commits
- Merge branch 'developer_repair_contact20200408' into 'developer' · 30bb99da
```
fix

See merge request !32
```
  qwmqiuwenmin authored Apr 08, 2020
  30bb99da Browse Files
- fix · e93ebe8f
  qwmqiuwenmin authored Apr 08, 2020
  
  e93ebe8f Browse Files
- Merge branch 'developer_repair_contact20200408' into 'developer' · da550e51
```
Developer repair contact20200408

See merge request !31
```
  qwmqiuwenmin authored Apr 08, 2020
  da550e51 Browse Files
- fix · e3c08632
  qwmqiuwenmin authored Apr 08, 2020
  
  e3c08632 Browse Files
- fix · 755b1cc8
  qwmqiuwenmin authored Apr 08, 2020
  
  755b1cc8 Browse Files
- Merge branch 'developer_repair_contact20200408' into 'developer' · fdeae43d
```
fix

See merge request !30
```
  qwmqiuwenmin authored Apr 08, 2020
  fdeae43d Browse Files
- Merge branch 'developer_repair_contact20200408' into 'developer' · 1aceb489
```
Developer repair contact20200408

See merge request !29
```
  qwmqiuwenmin authored Apr 08, 2020
  1aceb489 Browse Files
- fix · b1abbcba
  qwmqiuwenmin authored Apr 08, 2020
  
  b1abbcba Browse Files
- Merge branch 'developer_repair_contact20200408' into 'developer' · 8c6c4f80
```
fix

See merge request !28
```
  qwmqiuwenmin authored Apr 08, 2020
  8c6c4f80 Browse Files
- Merge branch 'developer' into 'developer_repair_contact20200408' · 1ea2f6aa
```
# Conflicts:
#   haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MessageApiServiceImpl.java
```
  qwmqiuwenmin authored Apr 08, 2020
  1ea2f6aa Browse Files
- Merge branch 'developer_repair_contact20200408' of… · e1b5faea
```
Merge branch 'developer_repair_contact20200408' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer_repair_contact20200408
```
  qwmqiuwenmin authored Apr 08, 2020
  e1b5faea Browse Files
- fix · f0e919fb
  qwmqiuwenmin authored Apr 08, 2020
  
  f0e919fb Browse Files
- fix · a6eaf2fa
  qwmqiuwenmin authored Apr 08, 2020
  
  a6eaf2fa Browse Files
- fix · 6018a1f2
  qwmqiuwenmin authored Apr 08, 2020
  
  6018a1f2 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · df55175f
  fudahua authored Apr 08, 2020
  
  df55175f Browse Files
- 同步接口门店的信息 · 9d88ee0e
  fudahua authored Apr 08, 2020
  
  9d88ee0e Browse Files
- Merge branch 'developer_repair_contact20200408' into 'developer' · a9878b56
```
fix

See merge request !27
```
  qwmqiuwenmin authored Apr 08, 2020
  a9878b56 Browse Files
- fix · 25630aa7
  qwmqiuwenmin authored Apr 08, 2020
  
  25630aa7 Browse Files
- Merge branch 'developer_repair_contact20200408' into 'developer' · b0e51d53
```
fix

See merge request !26
```
  qwmqiuwenmin authored Apr 08, 2020
  b0e51d53 Browse Files
- fix · b3f706ca
  qwmqiuwenmin authored Apr 08, 2020
  
  b3f706ca Browse Files
- Merge branch 'developer_repair_contact20200408' into 'developer' · 3d4c298c
```
Developer repair contact20200408

See merge request !25
```
  qwmqiuwenmin authored Apr 08, 2020
  3d4c298c Browse Files
- fix · 5f203fe8
  qwmqiuwenmin authored Apr 08, 2020
  
  5f203fe8 Browse Files
- 111 · 2b46aee1
  huangZW authored Apr 08, 2020
  
  2b46aee1 Browse Files
07 Apr, 2020 15 commits
- 111 · bb0fd6b5
  huangZW authored Apr 07, 2020
  
  bb0fd6b5 Browse Files
- 111 · fb5a2cb8
  huangZW authored Apr 07, 2020
  
  fb5a2cb8 Browse Files
- 111 · 1730e9ee
  huangZW authored Apr 07, 2020
  
  1730e9ee Browse Files
- 111 · c4a4834c
  huangZW authored Apr 07, 2020
  
  c4a4834c Browse Files
- 111 · 6d3697cb
  huangZW authored Apr 07, 2020
  
  6d3697cb Browse Files
- 111 · 4ae7dd55
  huangZW authored Apr 07, 2020
  
  4ae7dd55 Browse Files
- 111 · 31bb18be
  huangZW authored Apr 07, 2020
  
  31bb18be Browse Files
- 111 · 776391e6
  huangZW authored Apr 07, 2020
  
  776391e6 Browse Files
- 修改 · 14fd6473
  huangZW authored Apr 07, 2020
  
  14fd6473 Browse Files
- fix · 415bcd83
  qwmqiuwenmin authored Apr 07, 2020
  
  415bcd83 Browse Files
- 外部联系人信息 · 946ad375
  huangZW authored Apr 07, 2020
  
  946ad375 Browse Files
- fix · 073de3ae
  qwmqiuwenmin authored Apr 07, 2020
  
  073de3ae Browse Files
- Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer · 5ca21004
  qwmqiuwenmin authored Apr 07, 2020
  
  5ca21004 Browse Files
- fix · e5faab55
  qwmqiuwenmin authored Apr 07, 2020
  
  e5faab55 Browse Files
- 待完善接口 · b3beb659
  huangZW authored Apr 07, 2020
  
  b3beb659 Browse Files
03 Apr, 2020 2 commits
- Merge branch 'developer' into 'master' · 0188aa4a
```
Developer

See merge request !24
```
  fudahua authored Apr 03, 2020
  0188aa4a Browse Files
- emojo表情错误以及加入刷新接口 · 3614db44
  fudahua authored Apr 03, 2020
  
  3614db44 Browse Files