Commits · 18e1c5425bc89fcc7ebc75bb3be48d314c031fb4 · haoban3.0 / haoban-manage3.0

25 Jan, 2024 1 commit
- feature: 内容数据 · 18e1c542
  songyinghui authored Jan 25, 2024
  
  18e1c542 Browse Files
23 Jan, 2024 3 commits
- Merge branch 'feature/xgh/20241月迭代' into 'master' · 4936453d
```
Feature/xgh/20241月迭代

See merge request !1638
```
  徐高华 authored Jan 23, 2024
  4936453d Browse Files
- 离职继承的标识 · 2e013cfa
  徐高华 authored Jan 23, 2024
  
  2e013cfa Browse Files
- 操作日志bug · 41b9f3c9
  徐高华 authored Jan 23, 2024
  
  41b9f3c9 Browse Files
22 Jan, 2024 4 commits
- 记录好友删成员 · 8932bab9
  徐高华 authored Jan 22, 2024
  
  8932bab9 Browse Files
- 记录好友删成员 · 06f1a9f6
  徐高华 authored Jan 22, 2024
  
  06f1a9f6 Browse Files
- 记录好友删成员 · 556b7b13
  徐高华 authored Jan 22, 2024
  
  556b7b13 Browse Files
- 记录好友删成员 · 024be1ea
  徐高华 authored Jan 22, 2024
  
  024be1ea Browse Files
18 Jan, 2024 6 commits
- Merge branch 'bugfix-2024-01-17-rank' into 'master' · 4303fc88
```
竞赛单项添加数据类型字段

See merge request !1633
```
  guojx authored Jan 18, 2024
  4303fc88 Browse Files
- Merge branch 'feature/xgh/20241月迭代' into 'master' · ad1ed598
```
Feature/xgh/20241月迭代

See merge request !1632
```
  徐高华 authored Jan 18, 2024
  ad1ed598 Browse Files
- 订单企微支付成功处理激活码 · 90aa9c4f
  徐高华 authored Jan 18, 2024
  
  90aa9c4f Browse Files
- 订单企微支付成功处理激活码 · 1eb6d2fa
  徐高华 authored Jan 18, 2024
  
  1eb6d2fa Browse Files
- Merge branch 'feature/xgh/20241月迭代' into 'master' · 0e9f6e2f
```
非空判断

See merge request !1630
```
  徐高华 authored Jan 18, 2024
  0e9f6e2f Browse Files
- 非空判断 · a9fe2c72
  徐高华 authored Jan 18, 2024
  
  a9fe2c72 Browse Files
17 Jan, 2024 1 commit
- 竞赛单项添加数据类型字段 · 997e183f
  guojx authored Jan 17, 2024
  
  997e183f Browse Files
15 Jan, 2024 10 commits
- Merge branch 'feature-wm-data' into 'master' · dc235eb9
```
feature: 结束时间兼容

See merge request !1626
```
  songyinghui authored Jan 16, 2024
  dc235eb9 Browse Files
- feature: 结束时间兼容 · 013072b3
  songyinghui authored Jan 16, 2024
  
  013072b3 Browse Files
- Merge branch 'feature-wm-data' into 'master' · 0408071c
```
feature:  小程序兼容

See merge request !1625
```
  songyinghui authored Jan 16, 2024
  0408071c Browse Files
- feature: 小程序兼容 · 03ad2373
  songyinghui authored Jan 16, 2024
  
  03ad2373 Browse Files
- Merge branch 'feature/xgh/20241月迭代' into 'master' · 81e60918
```
不保存member_unionid表

See merge request !1623
```
  徐高华 authored Jan 15, 2024
  81e60918 Browse Files
- 不保存member_unionid表 · c0858c6e
  徐高华 authored Jan 15, 2024
  
  c0858c6e Browse Files
- Merge branch 'feature-wm-data' into 'master' · ada17731
```
Feature wm data

See merge request !1622
```
  songyinghui authored Jan 15, 2024
  ada17731 Browse Files
- Merge remote-tracking branch 'origin/master' into feature-wm-data · 1ab951b6
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/content/InteractRecordApiServiceImpl.java
```
  songyinghui authored Jan 15, 2024
  1ab951b6 Browse Files
- Merge branch 'feature/xgh/20241月迭代' into 'master' · bf1fb41d
```
Feature/xgh/20241月迭代

See merge request !1621
```
  徐高华 authored Jan 15, 2024
  bf1fb41d Browse Files
- 不保存member_unionid表 · 384ab49c
  徐高华 authored Jan 15, 2024
  
  384ab49c Browse Files
12 Jan, 2024 3 commits
- feature: 销售线索字段 · e5f4054a
  songyinghui authored Jan 12, 2024
  
  e5f4054a Browse Files
- 查询会员的好友导购 · 21b4d749
  徐高华 authored Jan 12, 2024
  
  21b4d749 Browse Files
- 查询会员的好友导购 · cbddf1e7
  徐高华 authored Jan 12, 2024
  
  cbddf1e7 Browse Files
11 Jan, 2024 2 commits
- Merge branch 'feature/订阅消息调整' into 'master' · feebecd9
```
去掉渠道

See merge request !1618
```
  徐高华 authored Jan 11, 2024
  feebecd9 Browse Files
- 去掉渠道 · 2933892d
  徐高华 authored Jan 11, 2024
  
  2933892d Browse Files
10 Jan, 2024 2 commits
- Merge branch 'feature/订阅消息调整' into 'master' · e0001ff6
```
会员合并删除

See merge request !1616
```
  徐高华 authored Jan 10, 2024
  e0001ff6 Browse Files
- 会员合并删除 · 908a4c99
  徐高华 authored Jan 10, 2024
  
  908a4c99 Browse Files
09 Jan, 2024 4 commits
- Merge branch 'feature-2023-12-data-rank' into 'master' · 6ea00e32
```
如果是前端传了门店id参数，则用前端的

See merge request !1613
```
  guojx authored Jan 09, 2024
  6ea00e32 Browse Files
- 如果是前端传了门店id参数，则用前端的 · f3083aff
  guojx authored Jan 09, 2024
  
  f3083aff Browse Files
- Merge branch 'feature-2023-12-data-rank' into 'master' · b2c1062c
```
Feature 2023 12 data rank

See merge request !1611
```
  guojx authored Jan 09, 2024
  b2c1062c Browse Files
- Merge branch 'feature/订阅消息调整' · 8663e7d1
```
# Conflicts:
#	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/HaobanCommonMQApiService.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/HaobanCommonMQApiServiceImpl.java
```
  徐高华 authored Jan 09, 2024
  8663e7d1 Browse Files
05 Jan, 2024 3 commits
- 赛区列表接口完善 · da2f810a
  guojx authored Jan 05, 2024
  
  da2f810a Browse Files
- 赛区列表接口完善 · 4bb5d169
  guojx authored Jan 05, 2024
  
  4bb5d169 Browse Files
- feature: 好办内容配置 · 57d08859
  songyinghui authored Jan 05, 2024
  
  57d08859 Browse Files
04 Jan, 2024 1 commit
- feature: 订单转化 · c998fd9f
  songyinghui authored Jan 04, 2024
  
  c998fd9f Browse Files