Commits · 4e571d9a6b63e0dbca96669590a497afe3f0e1d1 · pseer / gxpt_ht · GitLab

26 Sep, 2024 8 commits
- Merge branch 'dev' into test · 4e571d9a
  吕明尚 authored Sep 26, 2024
  
  4e571d9a Browse Files
- 人工修改密码，小程序统计时长接口 · 12b51259
  YG8429 authored Sep 26, 2024
  
  12b51259 Browse Files
- Merge branch 'dev' into test · 25b8b35e
  吕明尚 authored Sep 26, 2024
  
  25b8b35e Browse Files
- 赠送时长查询首次订单条件修改 · a927ce9e
  YG8429 authored Sep 26, 2024
  
  a927ce9e Browse Files
- Merge branch 'dev' into test · 457c3867
  吕明尚 authored Sep 26, 2024
  
  457c3867 Browse Files
- 修改积分日志和会员进度变动日志 · 884ad8e9
  吕明尚 authored Sep 26, 2024
  
  884ad8e9 Browse Files
- Merge branch 'dev' into test · def8488d
  吕明尚 authored Sep 26, 2024
  
  def8488d Browse Files
- 时长日志增加类型字段 · 44e0239b
  YG8429 authored Sep 26, 2024
  
  44e0239b Browse Files
25 Sep, 2024 8 commits
- 权益金过期时间修改为小时 · 333eb5e9
  YG8429 authored Sep 25, 2024
  
  333eb5e9 Browse Files
- 临时权益金新增返佣字段xml文件修改 · 6a2785dc
  YG8429 authored Sep 25, 2024
  
  6a2785dc Browse Files
- Merge branch 'dev' into test · d66a7d2d
  吕明尚 authored Sep 25, 2024
  
  d66a7d2d Browse Files
- 临时权益金记录查询修改，自动增加权益金定时任务修改 · 89f6b378
  YG8429 authored Sep 25, 2024
  
  89f6b378 Browse Files
- Merge branch 'dev' into test · 19579016
  吕明尚 authored Sep 25, 2024
  
  19579016 Browse Files
- 临时权益金增加返佣状态字段，人工退款增加删除临时权益金记录表，绑定关系增加查询 · 52cb8a7a
  YG8429 authored Sep 25, 2024
  
  52cb8a7a Browse Files
- Merge branch 'dev' into test · be1663db
  吕明尚 authored Sep 25, 2024
  
  be1663db Browse Files
- 设备增加添加校验 · 5ba32614
  吕明尚 authored Sep 25, 2024
  
  5ba32614 Browse Files
24 Sep, 2024 10 commits
- Merge branch 'dev' into test · 6cefa550
  吕明尚 authored Sep 24, 2024
  
  6cefa550 Browse Files
- 修改房间状态时段为整点不占用 · ea738a47
  吕明尚 authored Sep 24, 2024
  
  ea738a47 Browse Files
- Merge branch 'dev' into test · f67bb66f
  吕明尚 authored Sep 24, 2024
  
  f67bb66f Browse Files
- 修改次卡，月卡支付回调 · 80b1b6b7
  吕明尚 authored Sep 24, 2024
  
  80b1b6b7 Browse Files
- Merge branch 'dev' into test · 5e2dfe8b
  吕明尚 authored Sep 24, 2024
  
  5e2dfe8b Browse Files
- 修改次卡，月卡支付回调 · dfb44892
  吕明尚 authored Sep 24, 2024
  
  dfb44892 Browse Files
- 自动添加权益金定时任务日志修改 · d44ebe21
  YG8429 authored Sep 24, 2024
  
  d44ebe21 Browse Files
- Merge branch 'refs/heads/dev' into test · c43f9d99
  吕明尚 authored Sep 24, 2024
  
  c43f9d99 Browse Files
- 权益金过度表更改时间的返回JSON · 1c7686ee
  吕明尚 authored Sep 24, 2024
  
  1c7686ee Browse Files
- 小程序添加权益金未入账列表接口 · 2d1350ec
  YG8429 authored Sep 24, 2024
  
  2d1350ec Browse Files
23 Sep, 2024 10 commits
- Merge branch 'refs/heads/dev' into test · d32cbddd
  吕明尚 authored Sep 23, 2024
  
  d32cbddd Browse Files
- 订单计算增加折扣比例默认值 · 3583195e
  吕明尚 authored Sep 23, 2024
  
  3583195e Browse Files
- Merge branch 'refs/heads/dev' into test · ecd18fe9
  吕明尚 authored Sep 23, 2024
  
  ecd18fe9 Browse Files
- 小程序添加权益金未入账列表接口 · 643cc1db
  YG8429 authored Sep 23, 2024
  
  643cc1db Browse Files
- Merge branch 'refs/heads/dev' into test · 97b304b8
  吕明尚 authored Sep 23, 2024
  
  97b304b8 Browse Files
- 添加自动添加权益金定时任务 · 74f83a3e
  YG8429 authored Sep 23, 2024
  
  74f83a3e Browse Files
- 优化会员等级滚动降级定时任务 · 793ec24d
  吕明尚 authored Sep 23, 2024
  
  793ec24d Browse Files
- 添加自动添加权益金定时任务 · 1f1cc81f
  YG8429 authored Sep 23, 2024
  
  1f1cc81f Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · e1238278
```
# Conflicts:
#	share-system/src/main/java/share/system/service/impl/SConsumerServiceImpl.java
```
  YG8429 authored Sep 23, 2024
  e1238278 Browse Files
- 添加自动添加权益金定时任务 · c74a26ab
  YG8429 authored Sep 23, 2024
  
  c74a26ab Browse Files
20 Sep, 2024 4 commits
- Merge branch 'refs/heads/dev' into test · cfc668bf
  吕明尚 authored Sep 20, 2024
  
  cfc668bf Browse Files
- 优化会员等级滚动降级定时任务 · 5d4d2f19
  吕明尚 authored Sep 20, 2024
  
  5d4d2f19 Browse Files
- Merge branch 'refs/heads/dev' into test · dfb5153b
  吕明尚 authored Sep 20, 2024
  
  dfb5153b Browse Files
- 修改用户信息判断 · cdc82d20
  吕明尚 authored Sep 20, 2024
  
  cdc82d20 Browse Files