Commits · 6d3768c32fcc4b52c794db0ae33a80c59d4ffbd7 · haoban3.0 / haoban-manage3.0 · GitLab

23 Feb, 2022 2 commits
- fix：欢迎语修改 · 6d3768c3
  墨竹 authored Feb 23, 2022
  
  6d3768c3 Browse Files
- Merge branch 'master' into developer · a1416a2e
  墨竹 authored Feb 23, 2022
  
  a1416a2e Browse Files
22 Feb, 2022 23 commits
- Merge branch 'fix-20220222' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 · 6a0c704c
  xugaojun authored Feb 22, 2022
  
  6a0c704c Browse Files
- Merge branch 'fix-02-21_group_send' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 · b752fd0f
  xugaojun authored Feb 22, 2022
  
  b752fd0f Browse Files
- Merge branch 'fix-20220222' into developer · 1260e236
  xugaojun authored Feb 22, 2022
  
  1260e236 Browse Files
- 文案优化 · a50001c0
  xugaojun authored Feb 22, 2022
  
  a50001c0 Browse Files
- 修改文案 · 6fe09f98
  xugaojun authored Feb 22, 2022
  
  6fe09f98 Browse Files
- Merge branch 'fix-20220222' into developer · 9efbbd49
  fudahua authored Feb 22, 2022
  
  9efbbd49 Browse Files
- feat:先查看user是否存在再看手机号是否存在 · 11be4aa3
  fudahua authored Feb 22, 2022
  
  11be4aa3 Browse Files
- Merge branch 'fix-20220222' into developer · 9c1fc59b
  fudahua authored Feb 22, 2022
  
  9c1fc59b Browse Files
- feat:先查看user是否存在再看手机号是否存在 · 39e30223
  fudahua authored Feb 22, 2022
  
  39e30223 Browse Files
- Merge branch 'fix-20220222' into developer · 6f6d43b2
  fudahua authored Feb 22, 2022
  
  6f6d43b2 Browse Files
- feat:先查看user是否存在再看手机号是否存在 · 3852f241
  fudahua authored Feb 22, 2022
  
  3852f241 Browse Files
- Merge branch 'fix-20220222' into developer · a02bb68a
  fudahua authored Feb 22, 2022
  
  a02bb68a Browse Files
- feat:先查看user是否存在再看手机号是否存在 · f58de234
  fudahua authored Feb 22, 2022
  
  f58de234 Browse Files
- Merge branch 'fix_02-22_login' into developer · 32a50be2
  xugaojun authored Feb 22, 2022
  
  32a50be2 Browse Files
- 修复一个登录问题 · 813fac7b
  xugaojun authored Feb 22, 2022
  
  813fac7b Browse Files
- 修改添加位置 · a7972961
  xugaojun authored Feb 22, 2022
  
  a7972961 Browse Files
- 修改添加位置 · aaf6f5a2
  xugaojun authored Feb 22, 2022
  
  aaf6f5a2 Browse Files
- 优化查询方式 · 1ce56e98
  xugaojun authored Feb 22, 2022
  
  1ce56e98 Browse Files
- 优化告警参数 · 68a4b6ca
  xugaojun authored Feb 22, 2022
  
  68a4b6ca Browse Files
- 新增日志，添加告警提醒 · 26638d9c
  xugaojun authored Feb 22, 2022
  
  26638d9c Browse Files
- 欢迎语添加 · 39a7b1e1
  xugaojun authored Feb 22, 2022
  
  39a7b1e1 Browse Files
- Merge branch 'fix-02-21_group_send' into developer · fd3b6ea2
  xugaojun authored Feb 22, 2022
  
  fd3b6ea2 Browse Files
- 修改群发导购会员sql · 0d7e0023
  xugaojun authored Feb 22, 2022
  
  0d7e0023 Browse Files
21 Feb, 2022 15 commits
- Merge branch 'fix-02-21_group_send' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 · 897608a0
  xugaojun authored Feb 22, 2022
  
  897608a0 Browse Files
- 回退群发查询导购会员关联 · 57f90fea
  xugaojun authored Feb 22, 2022
  
  57f90fea Browse Files
- 回退群发查询导购会员关联 · 7a1740ba
  xugaojun authored Feb 21, 2022
  
  7a1740ba Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 00851533
  xugaojun authored Feb 21, 2022
  
  00851533 Browse Files
- 修复一个集合空指针 · 79a77c15
  xugaojun authored Feb 21, 2022
  
  79a77c15 Browse Files
- fix：删除企微好友回调给会员 · 334021c4
  墨竹 authored Feb 21, 2022
  
  334021c4 Browse Files
- fix：是否企微好友回调给会员 · c7ddcab5
  墨竹 authored Feb 21, 2022
  
  c7ddcab5 Browse Files
- Merge branch 'fix-02-21_group_send' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 · 2990cb57
  xugaojun authored Feb 21, 2022
  
  2990cb57 Browse Files
- Merge branch 'fix-02-21_group_send' into developer · 0e8be11d
  xugaojun authored Feb 21, 2022
  
  0e8be11d Browse Files
- fix：提示修改 · bf1980a9
  墨竹 authored Feb 21, 2022
  
  bf1980a9 Browse Files
- fix：加好友重试5次 · f0f91796
  墨竹 authored Feb 21, 2022
  
  f0f91796 Browse Files
- fix：加好友改为消息队列 · 03579d1e
  墨竹 authored Feb 21, 2022
  
  03579d1e Browse Files
- 兼容新老企业群发 · 886d2f0e
  xugaojun authored Feb 21, 2022
  
  886d2f0e Browse Files
- fix：合并代码 · a220f89c
  墨竹 authored Feb 21, 2022
  
  a220f89c Browse Files
- Merge branch 'fixbug_0221' into developer · c0397cca
```
# Conflicts:
#	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
#	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java
#	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java
#	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/StaffVO.java
```
  墨竹 authored Feb 21, 2022
  c0397cca Browse Files