Commit Graph

116 Commits

Author SHA1 Message Date
sxy
cd4e1492c8 Merge branch 'sxy' into dev 2025-06-24 16:01:05 +08:00
sxy
668b7eb06e 修改信息-服务类型 2025-06-24 16:00:45 +08:00
lzh
d6888a4e3c Merge branch 'dev-lzh' into dev 2025-06-24 15:14:18 +08:00
lzh
043274e61f 添加余量信息已购买字段 2025-06-24 15:08:37 +08:00
sxy
e46e5a3635 Merge branch 'sxy' into dev 2025-06-24 14:25:06 +08:00
sxy
eca1a2329e 增加语言表获取接口 2025-06-24 14:24:38 +08:00
sxy
3c1984be81 增加语言表获取接口 2025-06-24 14:22:31 +08:00
58a066315b 解决冲突 2025-06-24 13:42:22 +08:00
f02601e5e8 修改 2025-06-24 13:41:10 +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
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
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
sxy
792834ec27 Merge branch 'sxy' into dev 2025-06-19 16:17:38 +08:00
sxy
75aad32c7e Revert "修改h5套餐列表"
This reverts commit e081b5f23b.
2025-06-19 16:11:22 +08:00
sxy
51e3d24f23 Revert "修改h5套餐列表"
This reverts commit 0057fa5856.
2025-06-19 16:11:06 +08:00
sxy
7b12a726fd Merge branch 'sxy' into dev 2025-06-19 16:00:05 +08:00
sxy
0057fa5856 修改h5套餐列表 2025-06-19 15:59:54 +08:00
sxy
360b1377a8 Merge branch 'sxy' into dev 2025-06-19 15:58:31 +08:00
sxy
e081b5f23b 修改h5套餐列表 2025-06-19 15:58:11 +08:00
sxy
e7727141d8 修改h5套餐列表 2025-06-19 15:52:24 +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
5086802f1b 修改h5套餐列表 2025-06-19 15:46:29 +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
lzh
5e2fa0e7a0 更新proto 2025-06-19 15:10:30 +08:00
lzh
33cd40fafa Merge branch 'dev-lzh' into dev 2025-06-19 15:10:11 +08:00
lzh
3d226f9c8d 更新proto文件 2025-06-19 15:09:16 +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
379cc1b1e7 增加clor-1 2025-06-17 09:26:09 +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
cb76c941dd 冲突解决 2025-06-16 13:34:30 +08:00
sxy
8793f023c9 增加批量获取增值服务-1 2025-06-16 13:20:54 +08:00
sxy
9bffde4a62 增加批量获取增值服务 2025-06-16 13:13:27 +08:00
lzh
07b6296867 添加金额类型 2025-06-16 11:05:18 +08:00
lzh
6c7a1f9d44 提交时间类型修改 2025-06-16 09:03:39 +08:00
681589cf4d 解决冲突 2025-06-15 13:20:43 +08:00
d4b8be90ea 修改 2025-06-15 13:20:14 +08:00