|
|
a45369d1b5
|
Merge branch 'sxy' into dev
|
2025-06-23 16:25:17 +08:00 |
|
|
|
52d9baf2e6
|
修改上下架校验
|
2025-06-23 16:25:03 +08:00 |
|
|
|
cba59941cb
|
Merge branch 'sxy' into dev
|
2025-06-23 15:24:05 +08:00 |
|
|
|
ed0f0c9584
|
修改套餐逻辑
|
2025-06-23 15:23:49 +08:00 |
|
|
|
edc93077a7
|
Merge branch 'dev-lzh' into dev
|
2025-06-20 16:57:07 +08:00 |
|
|
|
75a75e9480
|
时区错误修改
|
2025-06-20 16:57:01 +08:00 |
|
|
|
f9510db2eb
|
Merge branch 'sxy' into dev
|
2025-06-20 16:26:40 +08:00 |
|
|
|
d0dfb7ff96
|
修改增值服务价格模式下的节省金额
|
2025-06-20 16:26:17 +08:00 |
|
|
|
fabc41aa92
|
Merge branch 'dev-lzh' into dev
|
2025-06-20 16:18:45 +08:00 |
|
|
|
c6a65f4589
|
1
|
2025-06-20 15:54:06 +08:00 |
|
|
|
c61ab9c0bd
|
Merge branch 'sxy' into dev
|
2025-06-20 15:35:06 +08:00 |
|
|
|
a6d315a283
|
修改增值服务保存逻辑-1
|
2025-06-20 15:34:55 +08:00 |
|
|
|
9d57cb0188
|
Merge branch 'sxy' into dev
|
2025-06-20 15:27:01 +08:00 |
|
|
|
952caaaf91
|
修改增值服务保存逻辑
|
2025-06-20 15:26:35 +08:00 |
|
|
|
32632183cf
|
Merge branch 'sxy' into dev
|
2025-06-20 14:58:46 +08:00 |
|
|
|
bff2938313
|
修改返回信息
|
2025-06-20 14:58:32 +08:00 |
|
|
|
44f40ee10f
|
Merge branch 'sxy' into dev
|
2025-06-20 14:34:09 +08:00 |
|
|
|
97c4bda203
|
修改价格模式-1
|
2025-06-20 14:33:57 +08:00 |
|
|
|
14415f07f5
|
修改价格模式
|
2025-06-20 14:31:55 +08:00 |
|
|
|
e39b72f666
|
Merge branch 'dev-lzh' into dev
|
2025-06-20 14:07:02 +08:00 |
|
|
|
94e5c77f90
|
过期时间精确到秒
|
2025-06-20 14:06:24 +08:00 |
|
|
|
8febf219f7
|
Merge branch 'sxy' into dev
|
2025-06-20 13:05:59 +08:00 |
|
|
|
d95dccf7c0
|
修改bug
|
2025-06-20 13:05:32 +08:00 |
|
|
|
ece5feb935
|
Merge branch 'dev-lzh' into dev
|
2025-06-20 10:27:23 +08:00 |
|
|
|
9b6549f141
|
添加关联订单号字段
|
2025-06-20 10:27:00 +08:00 |
|
|
|
8f6326bfaf
|
Merge branch 'dev-lzh' into dev
|
2025-06-20 09:42:49 +08:00 |
|
|
|
f612f8ad23
|
补充缺失字段
|
2025-06-20 09:42:14 +08:00 |
|
|
|
0304b71d8f
|
Merge branch 'sxy' into dev
|
2025-06-19 16:44:57 +08:00 |
|
|
|
33073667e8
|
修改上下架
|
2025-06-19 16:44:38 +08:00 |
|
|
|
41cd63b88a
|
Merge branch 'dev-lzh' into dev
|
2025-06-19 16:36:36 +08:00 |
|
|
|
02d0de5dad
|
使用真实姓名
|
2025-06-19 16:36:28 +08:00 |
|
|
|
44e5c9abe7
|
Merge branch 'sxy' into dev
|
2025-06-19 16:18:53 +08:00 |
|
|
|
ac14519c91
|
修改
|
2025-06-19 16:18:41 +08:00 |
|
|
|
792834ec27
|
Merge branch 'sxy' into dev
|
2025-06-19 16:17:38 +08:00 |
|
|
|
bdc9706125
|
修改
|
2025-06-19 16:16:23 +08:00 |
|
|
|
734c0b2c1f
|
修改
|
2025-06-19 16:12:03 +08:00 |
|
|
|
829891cb7c
|
Revert "Merge branch 'sxy' into dev"
This reverts commit 1883adf5b5, reversing
changes made to 044f79575c.
|
2025-06-19 15:47:44 +08:00 |
|
|
|
1883adf5b5
|
Merge branch 'sxy' into dev
|
2025-06-19 15:46:55 +08:00 |
|
|
|
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 |
|
|
|
46c62fa213
|
Merge branch 'sxy' into dev
|
2025-06-19 14:23:18 +08:00 |
|
|
|
53fdc7c4b6
|
修改套餐同步更新
|
2025-06-19 14:22:57 +08:00 |
|
|
|
eacfce8ea6
|
Merge branch 'sxy' into dev
|
2025-06-19 11:47:15 +08:00 |
|
|
|
eac7c759f6
|
修改错误信息返回
|
2025-06-19 11:46:53 +08:00 |
|
|
|
000de78286
|
修改错误信息返回
|
2025-06-19 11:43:54 +08:00 |
|
|
|
df96102509
|
Merge branch 'sxy' into dev
|
2025-06-18 15:49:43 +08:00 |
|
|
|
6107e35aca
|
修改
|
2025-06-18 15:49:21 +08:00 |
|
|
|
412e679b94
|
Merge branch 'sxy' into dev
|
2025-06-18 11:42:56 +08:00 |
|
|
|
4c027c4a08
|
修改
|
2025-06-18 11:42:39 +08:00 |
|
