Commits · 37f23abb6f47deae7b7cc13e4ec41e42d74b73c3 · haoban3.0 / haoban-manage3.0 · GitLab

23 Jun, 2022 9 commits
- Merge branch 'developer' into 'master' · 37f23abb
```
host

See merge request !179
```
  徐高华 authored Jun 23, 2022
  37f23abb Browse Files
- host · 63883fff
  徐高华 authored Jun 23, 2022
  
  63883fff Browse Files
- Merge branch 'developer' into 'master' · b2cef915
```
host

See merge request !178
```
  徐高华 authored Jun 23, 2022
  b2cef915 Browse Files
- host · 41979340
  徐高华 authored Jun 23, 2022
  
  41979340 Browse Files
- fix：去除跳过 · 18363526
  墨竹 authored Jun 23, 2022
  
  18363526 Browse Files
- fix：新增删除定时任务方法 · 3d77677a
  墨竹 authored Jun 23, 2022
  
  3d77677a Browse Files
- Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer · f070bf4b
  徐高华 authored Jun 23, 2022
  
  f070bf4b Browse Files
- log · a682bb8e
  徐高华 authored Jun 23, 2022
  
  a682bb8e Browse Files
- fix：新增创建定时任务接口 · d096b3fd
  墨竹 authored Jun 23, 2022
  
  d096b3fd Browse Files
20 Jun, 2022 4 commits
- fix：删除解绑 · c7f17e70
  墨竹 authored Jun 20, 2022
  
  c7f17e70 Browse Files
- fix：删除解绑 · 68775c92
  墨竹 authored Jun 20, 2022
  
  68775c92 Browse Files
- fix：门店筛选器权限去除当前好办企业交集 · 3aaf75ea
  墨竹 authored Jun 20, 2022
  
  3aaf75ea Browse Files
- fix：好友dingding提醒修改 · b91fbd7d
  墨竹 authored Jun 20, 2022
  
  b91fbd7d Browse Files
17 Jun, 2022 7 commits
- fix：增加注释 · ee9dffbe
  墨竹 authored Jun 17, 2022
  
  ee9dffbe Browse Files
- fix：代码优化 · 3f0e48a8
  墨竹 authored Jun 17, 2022
  
  3f0e48a8 Browse Files
- fix：代码优化 · 6023f3b4
  墨竹 authored Jun 17, 2022
  
  6023f3b4 Browse Files
- fix：dingding告警修改 · 5c4ab7ba
  墨竹 authored Jun 17, 2022
  
  5c4ab7ba Browse Files
- fix：注释修改 · a9db0e32
  墨竹 authored Jun 17, 2022
  
  a9db0e32 Browse Files
- fix：注释修改 · 302cc879
  墨竹 authored Jun 17, 2022
  
  302cc879 Browse Files
- fix：成员删除回调，判断成员在企微是否存在，并且已激活 · fb6773f3
  墨竹 authored Jun 17, 2022
  
  fb6773f3 Browse Files
15 Jun, 2022 3 commits
- 通讯录日志 · 604912e8
  徐高华 authored Jun 15, 2022
  
  604912e8 Browse Files
- Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer · 5cb52669
  徐高华 authored Jun 15, 2022
  
  5cb52669 Browse Files
- 删除管理员判断 · 858eff67
  徐高华 authored Jun 15, 2022
  
  858eff67 Browse Files
14 Jun, 2022 5 commits
- Merge branch 'master' into developer · 08d55439
  墨竹 authored Jun 14, 2022
  
  08d55439 Browse Files
- fix：合并会员修改 · bd54b8ce
  墨竹 authored Jun 14, 2022
  
  bd54b8ce Browse Files
- 登录 · d3e7c8be
  徐高华 authored Jun 14, 2022
  
  d3e7c8be Browse Files
- 登录缓存 · 3d9c37d5
  徐高华 authored Jun 14, 2022
  
  3d9c37d5 Browse Files
- fix：增加打印日志 · 12092eb2
  墨竹 authored Jun 14, 2022
  
  12092eb2 Browse Files
13 Jun, 2022 5 commits
- Merge branch 'master' into developer · 99fa5a65
  墨竹 authored Jun 13, 2022
  
  99fa5a65 Browse Files
- fix：会员合并bug修改 · 8aac2eae
  墨竹 authored Jun 13, 2022
  
  8aac2eae Browse Files
- Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer · 370ed9da
  徐高华 authored Jun 13, 2022
  
  370ed9da Browse Files
- sql bug · 755f76de
  徐高华 authored Jun 13, 2022
  
  755f76de Browse Files
- fix：空指针报错 · 8bb3b3dd
  墨竹 authored Jun 13, 2022
  
  8bb3b3dd Browse Files
10 Jun, 2022 1 commit
- 判断导购编辑 · e227e92e
  徐高华 authored Jun 10, 2022
  
  e227e92e Browse Files
09 Jun, 2022 6 commits
- fix：查询错误 · dbbc6292
  墨竹 authored Jun 09, 2022
  
  dbbc6292 Browse Files
- fix：查询错误 · a1bb9c63
  墨竹 authored Jun 09, 2022
  
  a1bb9c63 Browse Files
- Merge branch 'master' into developer · 3f0fc5d3
  墨竹 authored Jun 09, 2022
  
  3f0fc5d3 Browse Files
- fix：查询门店返回品牌名称 · bd40f7db
  墨竹 authored Jun 09, 2022
  
  bd40f7db Browse Files
- fix：查询门店返回企业名称和corpname修复 · eb069b39
  墨竹 authored Jun 09, 2022
  
  eb069b39 Browse Files
- Merge branch 'master' into developer · dc821aa5
```
# Conflicts:
#	haoban-manage3-service/src/main/resources/mapper/WxEnterpriseRelatedMapper.xml
#	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java
```
  墨竹 authored Jun 09, 2022
  dc821aa5 Browse Files