Commits · 08d55439f92cd92cb59af231c48cb2d8712c06d2 · haoban3.0 / haoban-manage3.0 · GitLab

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 7 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
- fix：查询门店返回企业名称和corpname修复 · 6b342a58
  墨竹 authored Jun 09, 2022
  
  6b342a58 Browse Files
08 Jun, 2022 2 commits
- feat：查询门店返回门店名称和corpname · c249b7d0
  墨竹 authored Jun 08, 2022
  
  c249b7d0 Browse Files
- feat：查询门店返回门店名称和corpname · 97eb3ce8
  墨竹 authored May 23, 2022
  
  97eb3ce8 Browse Files
07 Jun, 2022 4 commits
- fix：导购id自己获取 · 67e89fc7
  墨竹 authored Jun 07, 2022
  
  67e89fc7 Browse Files
- feat：判断空 · eca2924e
  墨竹 authored Jun 07, 2022
  
  eca2924e Browse Files
- feat：企微标签打标签改为消息队列 · e520a263
  墨竹 authored Jun 07, 2022
  
  e520a263 Browse Files
- feat：企微标签打标签改为消息队列 · 0be28b3b
  墨竹 authored Jun 07, 2022
  
  0be28b3b Browse Files
06 Jun, 2022 4 commits
- refactor：打印日志 · 4bd8c1c6
  墨竹 authored Jun 06, 2022
  
  4bd8c1c6 Browse Files
- refactor：删除旧权限代码 · 9de14422
  墨竹 authored Jun 06, 2022
  
  9de14422 Browse Files
- refactor：删除标签修改 · df5a3905
  墨竹 authored Jun 06, 2022
  
  df5a3905 Browse Files
- Merge branch 'master' into developer · e0387f7b
  墨竹 authored Jun 06, 2022
  
  e0387f7b Browse Files
02 Jun, 2022 8 commits
- feat：group by修改 · a58673cc
  墨竹 authored Jun 02, 2022
  
  a58673cc Browse Files
- 门店查询 · 6f434d72
  徐高华 authored Jun 02, 2022
  
  6f434d72 Browse Files
- api · 096b7ab1
  徐高华 authored Jun 02, 2022
  
  096b7ab1 Browse Files
- 门店查询优化 · 45a1af46
  徐高华 authored Jun 02, 2022
  
  45a1af46 Browse Files
- 门店查询条件优化 · 8f18f260
  徐高华 authored Jun 02, 2022
  
  8f18f260 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 36abde78
  墨竹 authored Jun 02, 2022
  
  36abde78 Browse Files
- feat：删除打印日志 · 4227025e
  墨竹 authored Jun 02, 2022
  
  4227025e Browse Files
- log · bc370c76
  徐高华 authored Jun 02, 2022
  
  bc370c76 Browse Files
01 Jun, 2022 4 commits
- 导购 · 04c0ee74
  徐高华 authored Jun 01, 2022
  
  04c0ee74 Browse Files
- 绑定日志 · 5ebca4df
  徐高华 authored Jun 01, 2022
  
  5ebca4df Browse Files
- 绑定日志 · b506ee46
  徐高华 authored Jun 01, 2022
  
  b506ee46 Browse Files
- 解绑日志 · d546a816
  徐高华 authored Jun 01, 2022
  
  d546a816 Browse Files