Commits · 858090fe31ce77932f7bc63d2dfd7f4889cb9292 · haoban3.0 / haoban-manage3.0 · GitLab

07 Aug, 2023 1 commit
- Merge remote-tracking branch 'origin/bugfix/2023-08-01' into feature/七月迭代 · 858090fe
  jinxin authored Aug 07, 2023
  
  858090fe Browse Files
02 Aug, 2023 1 commit
- 根据外部联系人id查询memberId · 27bd1492
  jinxin authored Aug 02, 2023
  
  27bd1492 Browse Files
01 Aug, 2023 2 commits
- 导购code问题修复 · df21c235
  jinxin authored Aug 01, 2023
  
  df21c235 Browse Files
- 导购code问题修复 · be88960f
  jinxin authored Aug 01, 2023
  
  be88960f Browse Files
28 Jul, 2023 2 commits
- Merge branch 'bugfix_0728_interactRecord_goods' into 'master' · d5a181ee
```
feat: 互动记录 浏览商品bug修复

See merge request !1373
```
  songyinghui authored Jul 28, 2023
  d5a181ee Browse Files
- feat: 互动记录浏览商品bug修复 · 5b68290b
  songyinghui authored Jul 28, 2023
  
  5b68290b Browse Files
27 Jul, 2023 8 commits
- Merge branch 'bugfix/2023-07-25' into 'master' · 6d21e7b8
```
Bugfix/2023 07 25

See merge request !1372
```
  徐高华 authored Jul 28, 2023
  6d21e7b8 Browse Files
- log · bd1a1688
  徐高华 authored Jul 28, 2023
  
  bd1a1688 Browse Files
- log · a667f558
  徐高华 authored Jul 27, 2023
  
  a667f558 Browse Files
- Merge branch 'bugfix/2023-07-25' into 'master' · dfd78b44
```
好办登录一天后才删除无效的导购

See merge request !1369
```
  徐高华 authored Jul 27, 2023
  dfd78b44 Browse Files
- 好办登录一天后才删除无效的导购 · aef746ad
  徐高华 authored Jul 27, 2023
  
  aef746ad Browse Files
- Merge remote-tracking branch 'origin/bugfix/2023-07-25' · b8178042
  jinxin authored Jul 27, 2023
  
  b8178042 Browse Files
- 活码删除 · b36340bb
  jinxin authored Jul 27, 2023
  
  b36340bb Browse Files
- Merge remote-tracking branch 'origin/bugfix/2023-07-25' · ba91c42b
  jinxin authored Jul 27, 2023
  
  ba91c42b Browse Files
25 Jul, 2023 3 commits
- Merge branch 'bugfix_0725_content' into 'master' · 474120b3
```
feat: 内容支持自建商品

See merge request !1367
```
  songyinghui authored Jul 25, 2023
  474120b3 Browse Files
- feat: 内容支持自建商品 · d8cf8971
  songyinghui authored Jul 25, 2023
  
  d8cf8971 Browse Files
- 对“$”符号和”\\“符号进行转移处理 · 45305950
  jinxin authored Jul 25, 2023
  
  45305950 Browse Files
20 Jul, 2023 3 commits
- 时间bug处理 · 4691457a
  jinxin authored Jul 20, 2023
  
  4691457a Browse Files
- 时间bug处理 · 9be24f19
  jinxin authored Jul 20, 2023
  
  9be24f19 Browse Files
- 日志记录 · 3cfa1674
  jinxin authored Jul 20, 2023
  
  3cfa1674 Browse Files
19 Jul, 2023 2 commits
- 待转移状态的许可激活码不需要处理 · 7917fc03
  jinxin authored Jul 19, 2023
  
  7917fc03 Browse Files
- 待转移状态的许可激活码不需要处理 · 57f69c8f
  jinxin authored Jul 19, 2023
  
  57f69c8f Browse Files
18 Jul, 2023 1 commit
- 订单api收敛 · acb9064a
  jinxin authored Jul 18, 2023
  
  acb9064a Browse Files
17 Jul, 2023 11 commits
- Merge branch 'feature-积分商城迁移' into 'master' · 3c9408f8
```
删除好友事件

See merge request !1364
```
  徐高华 authored Jul 18, 2023
  3c9408f8 Browse Files
- 删除好友事件 · f7f355e1
  徐高华 authored Jul 18, 2023
  
  f7f355e1 Browse Files
- Merge branch 'feature-积分商城迁移' into 'master' · 49d31a48
```
删除好友事件

See merge request !1363
```
  徐高华 authored Jul 17, 2023
  49d31a48 Browse Files
- 删除好友事件 · b22111eb
  徐高华 authored Jul 17, 2023
  
  b22111eb Browse Files
- Merge branch 'feature-积分商城迁移' into 'master' · 00b64dae
```
删除好友事件

See merge request !1360
```
  徐高华 authored Jul 17, 2023
  00b64dae Browse Files
- 删除好友事件 · 28c21da9
  徐高华 authored Jul 17, 2023
  
  28c21da9 Browse Files
- Merge branch 'feature-积分商城迁移' into 'master' · b22306cb
```
删除好友事件

See merge request !1358
```
  徐高华 authored Jul 17, 2023
  b22306cb Browse Files
- 删除好友事件 · 630490d9
  徐高华 authored Jul 17, 2023
  
  630490d9 Browse Files
- Merge remote-tracking branch 'origin/feature-积分商城迁移' · d7fd9542
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DealSyncOperationApiServiceImpl.java
#	haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml
```
  徐高华 authored Jul 17, 2023
  d7fd9542 Browse Files
- 删除好友事件 · e3698d8a
  徐高华 authored Jul 17, 2023
  
  e3698d8a Browse Files
- 删除好友事件 · 0a00ac01
  徐高华 authored Jul 17, 2023
  
  0a00ac01 Browse Files
13 Jul, 2023 2 commits
- 企业微信报错返回统一处理 · a27c753f
  jinxin authored Jul 13, 2023
  
  a27c753f Browse Files
- 时间戳问题处理 · 1e493013
  jinxin authored Jul 13, 2023
  
  1e493013 Browse Files
12 Jul, 2023 2 commits
- 时间戳问题处理 · bcb0309a
  jinxin authored Jul 12, 2023
  
  bcb0309a Browse Files
- 外部联系人变更通知会员修改状态 · 4f7dbb50
  jinxin authored Jul 12, 2023
  
  4f7dbb50 Browse Files
11 Jul, 2023 1 commit
- Merge remote-tracking branch 'origin/master' into bugfix/2023-07-06 · ee4838ac
  jinxin authored Jul 11, 2023
  
  ee4838ac Browse Files
10 Jul, 2023 1 commit
- clerkType类型问题 · 8e7ce7a9
  jinxin authored Jul 10, 2023
  
  8e7ce7a9 Browse Files