Commits · 255ede10a74c7bfc13a08a3f7d02089f2e641aef · haoban3.0 / haoban-manage3.0 · GitLab

17 Mar, 2022 1 commit
- 欢迎语小程序添加Page参数 · 255ede10
  xugaojun authored Mar 17, 2022
  
  255ede10 Browse Files
16 Mar, 2022 11 commits
- 优化刷新欢迎语逻辑 · 40818692
  xugaojun authored Mar 16, 2022
  
  40818692 Browse Files
- 修改欢迎语查询逻辑 · 8f373ff7
  xugaojun authored Mar 16, 2022
  
  8f373ff7 Browse Files
- 修改欢迎语查询逻辑 · 73cfcc31
  xugaojun authored Mar 16, 2022
  
  73cfcc31 Browse Files
- 修复欢迎语刷欢迎语逻辑 · 971d2146
  xugaojun authored Mar 16, 2022
  
  971d2146 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · ff00b258
  xugaojun authored Mar 16, 2022
  
  ff00b258 Browse Files
- Merge branch 'feature-0323' into developer · e0849897
  xugaojun authored Mar 16, 2022
  
  e0849897 Browse Files
- 修复欢迎语更新逻辑 · 00c19f55
  xugaojun authored Mar 16, 2022
  
  00c19f55 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · de09cbce
  墨竹 authored Mar 16, 2022
  
  de09cbce Browse Files
- Merge branch 'master' into developer · 7d4fb148
  墨竹 authored Mar 16, 2022
  
  7d4fb148 Browse Files
- fix：员工查询判断空 · 9d293256
  墨竹 authored Mar 16, 2022
  
  9d293256 Browse Files
- fix：部门查询判断空 · b431904b
  墨竹 authored Mar 16, 2022
  
  b431904b Browse Files
15 Mar, 2022 15 commits
- Merge branch 'feature-0323' into developer · 9bf6acaa
  xugaojun authored Mar 15, 2022
  
  9bf6acaa Browse Files
- 添加通知消息模板 · 602e93ac
  xugaojun authored Mar 15, 2022
  
  602e93ac Browse Files
- 修复设置值 · 81334f8e
  xugaojun authored Mar 15, 2022
  
  81334f8e Browse Files
- Merge branch 'fix_03_15' into developer · 90a49822
  xugaojun authored Mar 15, 2022
  
  90a49822 Browse Files
- 修复空指针问题 · 0c7270c8
  xugaojun authored Mar 15, 2022
  
  0c7270c8 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 13 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