Commits · 81cbfd142f8126d940acd2f8fab0237a286cfb94 · pseer / gxpt_ht · GitLab

14 Sep, 2024 9 commits
- Merge branch 'refs/heads/test' into test-lms · 81cbfd14
```
# Conflicts:
#	share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java
```
  吕明尚 authored Sep 14, 2024
  81cbfd14 Browse Files
- Merge branch 'refs/heads/dev' into test · 7af58467
  吕明尚 authored Sep 14, 2024
  
  7af58467 Browse Files
- 修改小程序查询本人权益记录和上级用户权益记录,后台修改绑定人 · 6a80cfd7
  YG8429 authored Sep 14, 2024
  
  6a80cfd7 Browse Files
- 修改月卡，次卡查询 · 17da91c4
  吕明尚 authored Sep 14, 2024
  
  17da91c4 Browse Files
- 修改小程序查询本人权益记录和上级用户权益记录 · 16e4736a
  YG8429 authored Sep 14, 2024
  
  16e4736a Browse Files
- Merge branch 'refs/heads/dev' into test · caf44548
  吕明尚 authored Sep 14, 2024
  
  caf44548 Browse Files
- 修改活动日的查询 · ed0873bc
  吕明尚 authored Sep 14, 2024
  
  ed0873bc Browse Files
- Merge branch 'refs/heads/dev' into test · e1ea5936
  吕明尚 authored Sep 14, 2024
  
  e1ea5936 Browse Files
- 修改获取权益会员购买逻辑 · 0f4a390d
  吕明尚 authored Sep 14, 2024
  
  0f4a390d Browse Files
13 Sep, 2024 24 commits
- 修改测试写死代码 · 680180a4
  YG8429 authored Sep 13, 2024
  
  680180a4 Browse Files
- Merge branch 'refs/heads/dev' into test · 0a9ffd13
  吕明尚 authored Sep 13, 2024
  
  0a9ffd13 Browse Files
- 累计积分的过期时间改成获取参数 · 498b4b90
  吕明尚 authored Sep 13, 2024
  
  498b4b90 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · efbcb256
  YG8429 authored Sep 13, 2024
  
  efbcb256 Browse Files
- 新增小程序查询当前用户上级接口 · 7e076a64
  YG8429 authored Sep 13, 2024
  
  7e076a64 Browse Files
- Merge branch 'refs/heads/dev' into test · 6ae4d61f
  吕明尚 authored Sep 13, 2024
  
  6ae4d61f Browse Files
- 会员的过期时间改成获取参数 · 92e6d3dc
  吕明尚 authored Sep 13, 2024
  
  92e6d3dc Browse Files
- 权益金记录新增字段修改 · d0a6f0cf
  YG8429 authored Sep 13, 2024
  
  d0a6f0cf Browse Files
- 权益金记录新增字段修改 · e881b955
  YG8429 authored Sep 13, 2024
  
  e881b955 Browse Files
- Merge branch 'refs/heads/dev' into test · 59758c1e
  吕明尚 authored Sep 13, 2024
  
  59758c1e Browse Files
- 会员的过期时间改成获取参数 · 7a8ba65d
  吕明尚 authored Sep 13, 2024
  
  7a8ba65d Browse Files
- Merge branch 'refs/heads/dev' into test · 36bbca61
  吕明尚 authored Sep 13, 2024
  
  36bbca61 Browse Files
- 会员的过期时间改成获取参数 · 24fe6fa7
  吕明尚 authored Sep 13, 2024
  
  24fe6fa7 Browse Files
- Merge branch 'refs/heads/dev' into test · b4bd8db2
  吕明尚 authored Sep 13, 2024
  
  b4bd8db2 Browse Files
- 修改定时任务 · b6c98ee5
  吕明尚 authored Sep 13, 2024
  
  b6c98ee5 Browse Files
- 权益金为空判断 · 44585381
  YG8429 authored Sep 13, 2024
  
  44585381 Browse Files
- 修改充值金额写死测试返佣 · 54b38569
  YG8429 authored Sep 13, 2024
  
  54b38569 Browse Files
- 修改小程序接口 · 1b011181
  YG8429 authored Sep 13, 2024
  
  1b011181 Browse Files
- 修改小程序接口 · 437e4715
  YG8429 authored Sep 13, 2024
  
  437e4715 Browse Files
- Merge branch 'refs/heads/test' into test-lms · ea1ee91f
  吕明尚 authored Sep 13, 2024
  
  ea1ee91f Browse Files
- Merge branch 'refs/heads/dev' into test · 9d98926c
  吕明尚 authored Sep 13, 2024
  
  9d98926c Browse Files
- 修改会员降级 · 5c98c300
  吕明尚 authored Sep 13, 2024
  
  5c98c300 Browse Files
- Merge branch 'refs/heads/dev' into test · 46e482f2
  吕明尚 authored Sep 13, 2024
  
  46e482f2 Browse Files
- 会员配置增加校验 · 460e6f33
  吕明尚 authored Sep 13, 2024
  
  460e6f33 Browse Files
12 Sep, 2024 7 commits
- Merge branch 'refs/heads/test' into test-lms · b9197556
  吕明尚 authored Sep 12, 2024
  
  b9197556 Browse Files
- Merge branch 'refs/heads/dev' into test · 061a7c79
  吕明尚 authored Sep 12, 2024
  
  061a7c79 Browse Files
- 修改权益订单配置管理系统 · 8dfce3f6
  吕明尚 authored Sep 12, 2024
  
  8dfce3f6 Browse Files
- 修改订单价格计算 · bcb79f3f
  吕明尚 authored Sep 12, 2024
  
  bcb79f3f Browse Files
- Merge branch 'refs/heads/test' into test-lms · 042e8a9c
```
# Conflicts:
#	share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java
```
  吕明尚 authored Sep 12, 2024
  042e8a9c Browse Files
- Merge branch 'refs/heads/dev' into test · 04476972
  吕明尚 authored Sep 12, 2024
  
  04476972 Browse Files
- 修改订单价格计算 · 747e6f47
  吕明尚 authored Sep 12, 2024
  
  747e6f47 Browse Files