Commits · 602e93ac95abafd62c8dced2b640c9afa87054dd · haoban3.0 / haoban-manage3.0 · GitLab

15 Mar, 2022 11 commits
- 添加通知消息模板 · 602e93ac
  xugaojun authored Mar 15, 2022
  
  602e93ac Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 264131c5
  墨竹 authored Mar 15, 2022
  
  264131c5 Browse Files
- Merge branch 'master' into developer · 00efd58e
  墨竹 authored Mar 15, 2022
  
  00efd58e Browse Files
- fix：审核通过不修改门店状态 · 42d3d1fb
  墨竹 authored Mar 15, 2022
  
  42d3d1fb Browse Files
- Merge branch 'fix_03_15' into developer · e4f50275
  xugaojun authored Mar 15, 2022
  
  e4f50275 Browse Files
- 修复一个sql问题 · 9fdcef36
  xugaojun authored Mar 15, 2022
  
  9fdcef36 Browse Files
- Merge branch 'fix_03_15' into developer · 330cc9ef
  xugaojun authored Mar 15, 2022
  
  330cc9ef Browse Files
- 修复一个空指针问题 · 13374900
  xugaojun authored Mar 15, 2022
  
  13374900 Browse Files
- Merge branch 'feature-0323' into developer · 60650d7d
  墨竹 authored Mar 15, 2022
  
  60650d7d Browse Files
- Merge branch 'master' into developer · 56dc4513
  墨竹 authored Mar 15, 2022
  
  56dc4513 Browse Files
- feat：默认同意授权配置 · 498ce87a
  墨竹 authored Mar 15, 2022
  
  498ce87a Browse Files
11 Mar, 2022 20 commits
- fix：批量转换wxopenuserid · a275b2a7
  墨竹 authored Mar 11, 2022
  
  a275b2a7 Browse Files
- Merge branch 'master' into developer · a96f3db3
  墨竹 authored Mar 11, 2022
  
  a96f3db3 Browse Files
- feat：新增修好友openuserid · ddc46624
  墨竹 authored Mar 11, 2022
  
  ddc46624 Browse Files
- Merge branch 'feature_03_11' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 · c0737f61
  墨竹 authored Mar 11, 2022
  
  c0737f61 Browse Files
- 添加企业成员插入wxOpenUserId · 34fa8ef6
  xugaojun authored Mar 11, 2022
  
  34fa8ef6 Browse Files
- feat：会员关联修改 · 53a824cf
  墨竹 authored Mar 11, 2022
  
  53a824cf Browse Files
- Merge branch 'fixbug_0311' into developer · 18850674
  墨竹 authored Mar 11, 2022
  
  18850674 Browse Files
- feat：会员关联修改 · fc4c3601
  墨竹 authored Mar 11, 2022
  
  fc4c3601 Browse Files
- Merge branch 'fixbug_0311' into developer · 80661701
  墨竹 authored Mar 11, 2022
  
  80661701 Browse Files
- feat：会员关联修改 · 5ccfaec3
  墨竹 authored Mar 11, 2022
  
  5ccfaec3 Browse Files
- Merge branch 'fixbug_0311' into developer · 5f080391
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/mq/processor/AddMemberUnionRelateConsumerProcessor.java
```
  墨竹 authored Mar 11, 2022
  5f080391 Browse Files
- feat：会员关联修改 · 5167d595
  墨竹 authored Mar 11, 2022
  
  5167d595 Browse Files
- Merge remote-tracking branch 'origin/feature-0323' into feature-0323 · ece17c12
  墨竹 authored Mar 11, 2022
  
  ece17c12 Browse Files
- feat：增加注释 · 8785c994
  墨竹 authored Mar 11, 2022
  
  8785c994 Browse Files
- 修改请求类型 · 0db89252
  xugaojun authored Mar 11, 2022
  
  0db89252 Browse Files
- 新增刷新欢迎语媒体接口 · 72faa9da
  xugaojun authored Mar 11, 2022
  
  72faa9da Browse Files
- feat：删除无效代码 · c39a6fc3
  墨竹 authored Mar 11, 2022
  
  c39a6fc3 Browse Files
- feat：代码优化 · 78cc11fd
  墨竹 authored Mar 11, 2022
  
  78cc11fd Browse Files
- Merge branch 'feature-0323' into developer · 84036f5f
  xugaojun authored Mar 11, 2022
  
  84036f5f Browse Files
- 优化欢迎语发送逻辑、兼容无主门店情况，仅发送一条欢迎语 · dc2765d0
  xugaojun authored Mar 11, 2022
  
  dc2765d0 Browse Files
10 Mar, 2022 9 commits
- Merge branch 'feature-0323' into developer · c0bc09e6
  xugaojun authored Mar 10, 2022
  
  c0bc09e6 Browse Files
- 优化更新逻辑 · faaff7e2
  xugaojun authored Mar 10, 2022
  
  faaff7e2 Browse Files
- 欢迎语发送，代码优化，修复一个更新问题 · 177109d0
  xugaojun authored Mar 10, 2022
  
  177109d0 Browse Files
- 修改小程序配置字段 · ef4b0c35
  xugaojun authored Mar 10, 2022
  
  ef4b0c35 Browse Files
- refactor：注释 · 7f26f874
  墨竹 authored Mar 10, 2022
  
  7f26f874 Browse Files
- feat：判断空 · c43333b3
  墨竹 authored Mar 10, 2022
  
  c43333b3 Browse Files
- 修复一个插入问题，修改欢迎语匹配逻辑 · d1f5f523
  xugaojun authored Mar 10, 2022
  
  d1f5f523 Browse Files
- Merge branch 'feature-0323' into developer · 5603028b
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java
```
  墨竹 authored Mar 10, 2022
  5603028b Browse Files
- feat：删除无效代码 · a1b8c03f
  墨竹 authored Mar 10, 2022
  
  a1b8c03f Browse Files