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

16 Aug, 2022 13 commits
- log · d4d4225b
  徐高华 authored Aug 16, 2022
  
  d4d4225b Browse Files
- Merge branch 'master' into developer · f06ee109
  墨竹 authored Aug 16, 2022
  
  f06ee109 Browse Files
- fix：活码空指针 · c663408b
  墨竹 authored Aug 16, 2022
  
  c663408b Browse Files
- Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer · 38482ed4
  徐高华 authored Aug 16, 2022
  
  38482ed4 Browse Files
- 通讯录 · a6666573
  徐高华 authored Aug 16, 2022
  
  a6666573 Browse Files
- fix：空指针 · befe9ae2
  墨竹 authored Aug 16, 2022
  
  befe9ae2 Browse Files
- fix：删除无效代码 · df7ff86f
  墨竹 authored Aug 16, 2022
  
  df7ff86f Browse Files
- fix：合并代码冲突 · 325b2e0e
  墨竹 authored Aug 16, 2022
  
  325b2e0e Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 2294ad5a
  墨竹 authored Aug 16, 2022
  
  2294ad5a Browse Files
- Merge branch 'master' into developer · 80eb1207
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffClerkRelationServiceImpl.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmQrcodeApiServiceImpl.java
```
  墨竹 authored Aug 16, 2022
  80eb1207 Browse Files
- fix：活码定时任务bug修改 · 06b76b30
  墨竹 authored Aug 16, 2022
  
  06b76b30 Browse Files
- 通讯录 · 698680c7
  徐高华 authored Aug 16, 2022
  
  698680c7 Browse Files
- 通讯录 · 638b3338
  徐高华 authored Aug 16, 2022
  
  638b3338 Browse Files
15 Aug, 2022 19 commits
- wx_user_id · c59b15dd
  徐高华 authored Aug 15, 2022
  
  c59b15dd Browse Files
- 更新通讯录 · 9bbc9f7f
  徐高华 authored Aug 15, 2022
  
  9bbc9f7f Browse Files
- 通讯录 · 51348fe9
  徐高华 authored Aug 15, 2022
  
  51348fe9 Browse Files
- Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer · bceb5f4c
  徐高华 authored Aug 15, 2022
  
  bceb5f4c Browse Files
- 通讯录 · 2f4550d9
  徐高华 authored Aug 15, 2022
  
  2f4550d9 Browse Files
- feat：删除活码wxUserId · 19185d42
  墨竹 authored Aug 15, 2022
  
  19185d42 Browse Files
- Merge branch 'master' into developer · ebaffebd
  墨竹 authored Aug 15, 2022
  
  ebaffebd Browse Files
- feat：状态修改 · f069d751
  墨竹 authored Aug 15, 2022
  
  f069d751 Browse Files
- feat：通讯录列表bug修改 · 167dab9e
  墨竹 authored Aug 15, 2022
  
  167dab9e Browse Files
- 地区码 · c37b3f5f
  徐高华 authored Aug 15, 2022
  
  c37b3f5f Browse Files
- 废弃staff_department_related的wx_user_id · 573c6950
  徐高华 authored Aug 15, 2022
  
  573c6950 Browse Files
- Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer · cec6ccf5
  徐高华 authored Aug 15, 2022
  
  cec6ccf5 Browse Files
- 删除wx_user_id · 24df0c81
  徐高华 authored Aug 15, 2022
  
  24df0c81 Browse Files
- feat：收费 · 1700d0cd
  墨竹 authored Aug 15, 2022
  
  1700d0cd Browse Files
- wx_user_id · d3311953
  徐高华 authored Aug 15, 2022
  
  d3311953 Browse Files
- log · 5f29eb41
  徐高华 authored Aug 15, 2022
  
  5f29eb41 Browse Files
- log · 585280a1
  徐高华 authored Aug 15, 2022
  
  585280a1 Browse Files
- 增加非空判断 · acf3da5b
  徐高华 authored Aug 15, 2022
  
  acf3da5b Browse Files
- fix：dingding提醒标题修改 · 5ca20c4d
  墨竹 authored Aug 15, 2022
  
  5ca20c4d Browse Files
12 Aug, 2022 8 commits
- 通讯录 · 79dbd9d0
  徐高华 authored Aug 12, 2022
  
  79dbd9d0 Browse Files
- log · 4e333dbd
  徐高华 authored Aug 12, 2022
  
  4e333dbd Browse Files
- Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer · 68f11f7e
  徐高华 authored Aug 12, 2022
  
  68f11f7e Browse Files
- 通讯录 · 4e8571c6
  徐高华 authored Aug 12, 2022
  
  4e8571c6 Browse Files
- Merge branch 'master' into developer · 24dc8dfd
  墨竹 authored Aug 12, 2022
  
  24dc8dfd Browse Files
- fix：批量新增活码名字重复 · 4582c4a8
  墨竹 authored Aug 12, 2022
  
  4582c4a8 Browse Files
- fix：收费 · 94cddc37
  墨竹 authored Aug 12, 2022
  
  94cddc37 Browse Files
- 删除客户联系 · b7f11349
  徐高华 authored Aug 12, 2022
  
  b7f11349 Browse Files