Commit Graph

101 Commits

Author SHA1 Message Date
dad01f7f85 解决冲突 2025-07-08 16:12:50 +08:00
383a64077d 添加手续费 2025-07-08 16:12:16 +08:00
1dada43e0c 解决冲突 2025-07-07 19:34:57 +08:00
402a7644e6 fix: 提交支持自动创建用户和订单代码 2025-07-07 13:31:17 +08:00
lzh
776574c4e0 Merge branch 'dev-lzh' into dev 2025-07-07 10:46:51 +08:00
lzh
87b7805c42 添加扩展记录的时间单位 2025-07-07 10:46:13 +08:00
d5e4c9590f Merge branch 'jng' 2025-07-03 16:11:44 +08:00
bda31412ee Merge branch 'jng' into dev 2025-07-03 14:31:35 +08:00
e7a5e19472 添加手续费字段 2025-07-03 14:02:25 +08:00
lzh
37c525d5c2 "优化用户余额查询SQL,增加过期时间倒序排序;修正发布平台ID字段命名大小写不一致问题" 2025-06-27 16:10:39 +08:00
lzh
4ec5bb8915 "修正字段命名大小写不一致问题" 2025-06-27 15:29:53 +08:00
sxy
ae4bbe29c0 Merge branch 'sxy' 2025-06-26 17:31:25 +08:00
lzh
bfc409ed70 Merge branch 'dev-lzh' 2025-06-26 17:18:58 +08:00
sxy
cba59941cb Merge branch 'sxy' into dev 2025-06-23 15:24:05 +08:00
sxy
ed0f0c9584 修改套餐逻辑 2025-06-23 15:23:49 +08:00
sxy
9d57cb0188 Merge branch 'sxy' into dev 2025-06-20 15:27:01 +08:00
sxy
952caaaf91 修改增值服务保存逻辑 2025-06-20 15:26:35 +08:00
sxy
44f40ee10f Merge branch 'sxy' into dev 2025-06-20 14:34:09 +08:00
sxy
14415f07f5 修改价格模式 2025-06-20 14:31:55 +08:00
sxy
54ea18edc4 Merge branch 'sxy' into dev 2025-06-20 14:18:49 +08:00
sxy
3bc6a5caa0 修改imgoption 2025-06-20 14:16:45 +08:00
lzh
83ea888de1 Merge branch 'dev-lzh' into dev 2025-06-20 14:14:50 +08:00
lzh
f933e4887f 添加扩展时间字段 2025-06-20 14:14:44 +08:00
sxy
b9c0b6b282 Merge branch 'sxy' into dev 2025-06-20 11:42:56 +08:00
sxy
bcdb764522 修改bug 2025-06-20 11:42:41 +08:00
lzh
137255a2e1 Merge branch 'dev-lzh' into dev 2025-06-20 10:41:27 +08:00
lzh
99c4b85a62 订单号字段错误修改 2025-06-20 10:41:20 +08:00
lzh
f4036ffa77 Merge branch 'dev-lzh' into dev 2025-06-20 10:37:54 +08:00
lzh
16f5e1f7ec 订单号字段错误修改 2025-06-20 10:37:38 +08:00
lzh
e59d05f1e5 Merge branch 'dev-lzh' into dev 2025-06-20 10:33:38 +08:00
lzh
0429854814 订单号字段错误修改 2025-06-20 10:33:32 +08:00
lzh
ece5feb935 Merge branch 'dev-lzh' into dev 2025-06-20 10:27:23 +08:00
lzh
9b6549f141 添加关联订单号字段 2025-06-20 10:27:00 +08:00
lzh
8f6326bfaf Merge branch 'dev-lzh' into dev 2025-06-20 09:42:49 +08:00
lzh
f612f8ad23 补充缺失字段 2025-06-20 09:42:14 +08:00
lzh
f2332671aa Merge branch 'dev-lzh' into dev 2025-06-19 16:01:37 +08:00
lzh
0dce0b80a6 余量套餐状态添加 2025-06-19 16:00:51 +08:00
lzh
505f459d89 Merge branch 'dev-lzh' into dev 2025-06-19 15:54:02 +08:00
lzh
b151326427 余量信息电话号码添加 2025-06-19 15:53:56 +08:00
lzh
e52b81f5c7 Merge branch 'dev-lzh' into dev 2025-06-19 15:03:02 +08:00
lzh
a6fddccda9 添加扩展类型字段 2025-06-19 14:52:54 +08:00
lzh
19ac6f4bf3 Merge branch 'dev-lzh' into dev 2025-06-17 14:15:36 +08:00
lzh
32de65196b 添加确认状态 2025-06-17 14:14:09 +08:00
sxy
5e6f69bacf Merge branch 'sxy' into dev 2025-06-17 09:26:29 +08:00
sxy
0c5ffdcc90 增加clor 2025-06-17 09:24:18 +08:00
lzh
8ce0c39fb1 Merge branch 'dev-lzh' into dev 2025-06-16 13:41:37 +08:00
lzh
8a14905343 添加金额类型 2025-06-16 13:40:50 +08:00
lzh
07b6296867 添加金额类型 2025-06-16 11:05:18 +08:00
4ad9771a3a 解决冲突 2025-06-15 14:51:25 +08:00
lzh
9ef0599430 Merge branch 'dev-lzh' into dev 2025-06-15 13:50:27 +08:00