Commits · 85371db90afbde02269325303a7d95ac07a95c2b · haoban3.0 / haoban-manage3.0 · GitLab

15 Feb, 2023 5 commits
- Merge branch 'developer' into 'master' · 85371db9
```
Developer

See merge request !959
```
  徐高华 authored Feb 15, 2023
  85371db9 Browse Files
- Merge remote-tracking branch 'origin/master_xgh_加好友队列调整' into developer · 7c01d458
```
Conflicts:
	haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmQrcodeController.java
```
  徐高华 authored Feb 15, 2023
  7c01d458 Browse Files
- 记录单个转移的成功日志 · 8628e481
  jinxin authored Feb 15, 2023
  
  8628e481 Browse Files
- 所有的时候不带活码ID查询 · 4f409ddc
  徐高华 authored Feb 15, 2023
  
  4f409ddc Browse Files
- Merge branch 'feature-appointment' into 'master' · 9d05b348
```
线下预约最大积分赠送限制

See merge request !956
```
  zhangzhendong authored Feb 15, 2023
  9d05b348 Browse Files
14 Feb, 2023 2 commits
- Merge branch 'master_xgh_加好友队列调整' into 'developer' · 10352019
```
延迟10秒

See merge request !955
```
  徐高华 authored Feb 14, 2023
  10352019 Browse Files
- 延迟10秒 · 1f795b2e
  徐高华 authored Feb 14, 2023
  
  1f795b2e Browse Files
13 Feb, 2023 6 commits
- Merge remote-tracking branch 'origin/developer-2023-02-15' into developer · e3b515f5
  jinxin authored Feb 13, 2023
  
  e3b515f5 Browse Files
- 记录单个转移的成功日志 · ccf05beb
  jinxin authored Feb 13, 2023
  
  ccf05beb Browse Files
- Merge remote-tracking branch 'origin/developer-2023-02-15' into developer · 13d0e5a8
  jinxin authored Feb 13, 2023
  
  13d0e5a8 Browse Files
- 记录单个转移的成功日志 · 412eb6b0
  jinxin authored Feb 13, 2023
  
  412eb6b0 Browse Files
- Merge remote-tracking branch 'origin/developer-2023-02-15' into developer · 97cf9a42
  jinxin authored Feb 13, 2023
  
  97cf9a42 Browse Files
- 记录单个转移的成功日志 · d627df05
  jinxin authored Feb 13, 2023
  
  d627df05 Browse Files
11 Feb, 2023 4 commits
- Merge branch 'master_xgh_加好友队列调整' into 'developer' · 10bc3fde
```
log

See merge request !954
```
  徐高华 authored Feb 11, 2023
  10bc3fde Browse Files
- log · aead97af
  徐高华 authored Feb 11, 2023
  
  aead97af Browse Files
- Merge branch 'master_xgh_加好友队列调整' into 'developer' · fb9ea626
```
加好友队列

See merge request !953
```
  徐高华 authored Feb 11, 2023
  fb9ea626 Browse Files
- 加好友队列 · ae84e31c
  徐高华 authored Feb 11, 2023
  
  ae84e31c Browse Files
09 Feb, 2023 8 commits
- Merge branch 'master_xgh_加好友队列调整' into 'master' · bcf84b3f
```
Master xgh 加好友队列调整

See merge request !952
```
  徐高华 authored Feb 09, 2023
  bcf84b3f Browse Files
- Merge branch 'master_xgh_加好友队列调整' into 'developer' · 77a0bbb0
```
Master xgh 加好友队列调整

See merge request !951
```
  徐高华 authored Feb 09, 2023
  77a0bbb0 Browse Files
- 分队列 · 491662b8
  徐高华 authored Feb 09, 2023
  
  491662b8 Browse Files
- mq · 072049b4
  徐高华 authored Feb 09, 2023
  
  072049b4 Browse Files
- Merge branch 'master_xgh_加好友队列调整' into 'master' · 3be15341
```
Master xgh 加好友队列调整

See merge request !950
```
  徐高华 authored Feb 09, 2023
  3be15341 Browse Files
- Merge branch 'master_xgh_加好友队列调整' into 'developer' · d60b3fd2
```
Master xgh 加好友队列调整

See merge request !949
```
  徐高华 authored Feb 09, 2023
  d60b3fd2 Browse Files
- test · f811781e
  徐高华 authored Feb 09, 2023
  
  f811781e Browse Files
- 加好友队列 · 06b4f2b2
  徐高华 authored Feb 09, 2023
  
  06b4f2b2 Browse Files
08 Feb, 2023 12 commits
- Merge branch 'feature-2023-01-目标配置' into 'developer' · 18dcf7d4
```
目标跟进核心指标趋势分月/累计

See merge request !948
```
  guojx authored Feb 08, 2023
  18dcf7d4 Browse Files
- 目标跟进核心指标趋势分月/累计 · 8c8b8b58
  guojx authored Feb 08, 2023
  
  8c8b8b58 Browse Files
- Merge branch 'feature-2023-01-目标配置' into 'developer' · b53d9e55
```
Feature 2023 01 目标配置

See merge request !947
```
  guojx authored Feb 08, 2023
  b53d9e55 Browse Files
- 目标跟进核心指标趋势分月/累计 · 7b3cfbef
  guojx authored Feb 08, 2023
  
  7b3cfbef Browse Files
- 目标跟进核心指标趋势分月/累计 · 97ed66d3
  guojx authored Feb 08, 2023
  
  97ed66d3 Browse Files
- Merge branch 'feature-2023-01-目标配置' into 'developer' · 4dd66e06
```
目标跟进核心指标趋势分月/累计

See merge request !944
```
  guojx authored Feb 08, 2023
  4dd66e06 Browse Files
- 目标跟进核心指标趋势分月/累计 · 2ee3bb57
  guojx authored Feb 08, 2023
  
  2ee3bb57 Browse Files
- Merge branch 'feature-2023-01-目标配置' into 'developer' · 3da269be
```
目标跟进达成分析门店明细数据调整：默认正序

See merge request !943
```
  guojx authored Feb 08, 2023
  3da269be Browse Files
- 目标跟进达成分析门店明细数据调整：默认正序 · d120c441
  guojx authored Feb 08, 2023
  
  d120c441 Browse Files
- Merge branch 'feature/预约-好办活码接口' into 'developer-2023-02-15' · f38574c5
```
Feature/预约 好办活码接口

See merge request !942
```
  徐高华 authored Feb 08, 2023
  f38574c5 Browse Files
- Merge branch 'feature/预约-好办活码接口' into 'developer' · 8a4c88d1
```
Feature/预约 好办活码接口

See merge request !941
```
  徐高华 authored Feb 08, 2023
  8a4c88d1 Browse Files
- 好办加好友 · 2e77b32c
  徐高华 authored Feb 08, 2023
  
  2e77b32c Browse Files
07 Feb, 2023 3 commits
- Merge remote-tracking branch 'origin/developer-2023-02-15' into developer · 8489f554
  jinxin authored Feb 07, 2023
  
  8489f554 Browse Files
- active_status字段删除 · 1a89265a
  jinxin authored Feb 07, 2023
  
  1a89265a Browse Files
- Merge branch 'developer-2023-02-15' into 'developer' · 019e3724
```
Developer 2023 02 15

See merge request !940
```
  徐高华 authored Feb 07, 2023
  019e3724 Browse Files