Commit Graph

422 Commits

Author SHA1 Message Date
lzh
5a3367e47d Merge branch 'dev-lzh' into dev 2025-06-24 17:08:47 +08:00
lzh
1885d2b8dc "优化用户余额查询的JOIN方式并添加分组" 2025-06-24 17:08:36 +08:00
lzh
7154d0a92a Merge branch 'dev-lzh' into dev 2025-06-24 16:29:20 +08:00
lzh
f55af5f719 过滤待确认条件 2025-06-24 16:29:11 +08:00
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
sxy
6e29d40998 Merge branch 'sxy' into dev 2025-06-24 15:54:25 +08:00
sxy
56c17a709f 修改信息 2025-06-24 15:53:10 +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
lzh
38fccfa827 Merge branch 'dev-lzh' into dev 2025-06-24 15:04:16 +08:00
lzh
0167e40f9e 过滤重复的作品id 2025-06-24 15:04:09 +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
lzh
e8f76dd102 Merge branch 'dev-lzh' into dev 2025-06-24 14:03:55 +08:00
lzh
46a6c5723f 过滤被删除的用户 2025-06-24 14:03:35 +08:00
58a066315b 解决冲突 2025-06-24 13:42:22 +08:00
f02601e5e8 修改 2025-06-24 13:41:10 +08:00
lzh
93ccab7d42 Merge branch 'dev-lzh' into dev 2025-06-24 13:38:22 +08:00
lzh
bfa9fc4026 订单记录取最新 2025-06-24 13:38:16 +08:00
lzh
621f6c906d Merge branch 'dev-lzh' into dev 2025-06-24 12:00:17 +08:00
lzh
fb3b33a817 显示过期的套餐信息 2025-06-24 12:00:09 +08:00
lzh
360ea2b4d5 Merge branch 'dev-lzh' into dev 2025-06-24 11:27:58 +08:00
lzh
70c4eacce4 1 2025-06-24 11:27:50 +08:00
sxy
a45369d1b5 Merge branch 'sxy' into dev 2025-06-23 16:25:17 +08:00
sxy
52d9baf2e6 修改上下架校验 2025-06-23 16:25:03 +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
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
sxy
f9510db2eb Merge branch 'sxy' into dev 2025-06-20 16:26:40 +08:00
sxy
d0dfb7ff96 修改增值服务价格模式下的节省金额 2025-06-20 16:26:17 +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
lzh
c6a65f4589 1 2025-06-20 15:54:06 +08:00
19aa5b8955 解决冲突 2025-06-20 15:47:25 +08:00
5753c952f4 修改 2025-06-20 15:45:58 +08:00
sxy
c61ab9c0bd Merge branch 'sxy' into dev 2025-06-20 15:35:06 +08:00
sxy
a6d315a283 修改增值服务保存逻辑-1 2025-06-20 15:34:55 +08:00