Commit Graph

193 Commits

Author SHA1 Message Date
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
lzh
06da79539e Merge branch 'dev-lzh' into dev 2025-06-23 14:26:43 +08:00
lzh
f82a96907c 1 2025-06-23 14:24:12 +08:00
lzh
3506b1fdc7 Merge branch 'dev-lzh' into dev 2025-06-23 14:11:32 +08:00
lzh
24c701d9a1 修改使用记录的用户名搜索 2025-06-23 14:11:07 +08:00
lzh
99ba1fc52d Merge branch 'dev-lzh' into dev 2025-06-23 13:55:34 +08:00
lzh
37bae4398d 修改使用记录排序 2025-06-23 13:55:29 +08:00
lzh
107a457111 Merge branch 'dev-lzh' into dev 2025-06-23 10:37:11 +08:00
lzh
d3b82f4352 余量列表支持电话号码搜索 2025-06-23 10:37:04 +08:00
lzh
edc93077a7 Merge branch 'dev-lzh' into dev 2025-06-20 16:57:07 +08:00
lzh
75a75e9480 时区错误修改 2025-06-20 16:57:01 +08:00
lzh
1228060121 Merge branch 'dev-lzh' into dev 2025-06-20 16:36:17 +08:00
lzh
8528412c33 补充余量信息user_id 2025-06-20 16:36:11 +08:00
lzh
fabc41aa92 Merge branch 'dev-lzh' into dev 2025-06-20 16:18:45 +08:00
lzh
4e2faf05cb 添加未购买过滤 2025-06-20 16:18:20 +08:00
19aa5b8955 解决冲突 2025-06-20 15:47:25 +08:00
5753c952f4 修改 2025-06-20 15:45:58 +08:00
lzh
b896c73fbb Merge branch 'dev-lzh' into dev 2025-06-20 15:29:10 +08:00
lzh
9e36dfde6b 扩展记录时间服务 2025-06-20 15:28:50 +08:00
lzh
9f5798c2be 扩展记录时间服务 2025-06-20 15:26:50 +08:00
lzh
c545988663 Merge branch 'dev-lzh' into dev 2025-06-20 15:24:29 +08:00
lzh
e26829e19b 扩展记录用户名搜索 2025-06-20 15:24:24 +08:00
lzh
145a4258eb Merge branch 'dev-lzh' into dev 2025-06-20 15:10:46 +08:00
lzh
089d8af480 支持套餐名搜索 2025-06-20 15:10:39 +08:00
lzh
5c0652888e Merge branch 'dev-lzh' into dev 2025-06-20 14:58:00 +08:00
lzh
0fae4587d8 使用真实姓名搜索 2025-06-20 14:57:54 +08:00
lzh
f9fe550528 Merge branch 'dev-lzh' into dev 2025-06-20 14:42:27 +08:00
lzh
2d9d620062 支持json搜索 2025-06-20 14:42:21 +08:00
lzh
e39b72f666 Merge branch 'dev-lzh' into dev 2025-06-20 14:07:02 +08:00
lzh
94e5c77f90 过期时间精确到秒 2025-06-20 14:06:24 +08:00
190faad47f Merge branch 'jng' into dev 2025-06-20 13:24:13 +08:00
53a407cc1c 修改 2025-06-20 13:23:47 +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
d85bfa4fa0 修改余量查询错误 2025-06-20 10:05:55 +08:00
lzh
b415537dd7 修改余量查询错误 2025-06-20 10:05:31 +08:00
lzh
3da31de230 Merge branch 'dev-lzh' into dev 2025-06-19 16:59:34 +08:00
lzh
fbea508cfe 使用真实姓名 2025-06-19 16:59:27 +08:00
lzh
41cd63b88a Merge branch 'dev-lzh' into dev 2025-06-19 16:36:36 +08:00
lzh
02d0de5dad 使用真实姓名 2025-06-19 16:36:28 +08:00
sxy
44e5c9abe7 Merge branch 'sxy' into dev 2025-06-19 16:18:53 +08:00
sxy
ac14519c91 修改 2025-06-19 16:18:41 +08:00
sxy
792834ec27 Merge branch 'sxy' into dev 2025-06-19 16:17:38 +08:00
sxy
bdc9706125 修改 2025-06-19 16:16:23 +08:00
sxy
829891cb7c Revert "Merge branch 'sxy' into dev"
This reverts commit 1883adf5b5, reversing
changes made to 044f79575c.
2025-06-19 15:47:44 +08:00
sxy
1883adf5b5 Merge branch 'sxy' into dev 2025-06-19 15:46:55 +08:00
sxy
fdf2d5a09b 修改h5列表 2025-06-19 15:44:55 +08:00
044f79575c 解决冲突 2025-06-19 15:29:41 +08:00
c537e1e50c 修改 2025-06-19 15:26:08 +08:00