|
|
ec7be8fde0
|
Merge branch 'sxy-sec' into dev
|
2025-06-17 14:46:24 +08:00 |
|
|
|
8d28627e5f
|
修改接口认证
|
2025-06-17 14:46:09 +08:00 |
|
|
|
cb707c96e1
|
Merge branch 'dev-lzh' into dev
|
2025-06-17 14:28:29 +08:00 |
|
|
|
5ad6d318e0
|
添加确认变更的接口
|
2025-06-17 14:27:43 +08:00 |
|
|
|
d4eebacbda
|
Merge branch 'sxy-sec' into dev
|
2025-06-17 14:07:50 +08:00 |
|
|
|
d14dbaaf99
|
修改官网数据
|
2025-06-17 14:07:30 +08:00 |
|
|
|
fad92b5991
|
Merge branch 'chat' into dev
|
2025-06-17 11:22:05 +08:00 |
|
|
|
4643de4f6e
|
fix: 修复role没有值的问题
|
2025-06-17 11:21:53 +08:00 |
|
|
|
96db32a381
|
Merge branch 'sxy' into dev
|
2025-06-17 09:27:42 +08:00 |
|
|
|
9f5948a253
|
修改proto-color
|
2025-06-17 09:27:20 +08:00 |
|
|
|
a38cc36e51
|
Merge branch 'chat' into dev
|
2025-06-16 15:52:06 +08:00 |
|
|
|
55c74ea17c
|
fix: 修复卡片类型内容不展示
|
2025-06-16 15:51:52 +08:00 |
|
|
|
653fe27066
|
冲突解决
|
2025-06-16 13:42:46 +08:00 |
|
|
|
bef76dc3f0
|
添加套餐金额类型
|
2025-06-16 13:35:46 +08:00 |
|
|
|
d0a93eb229
|
Merge branch 'sxy' into dev
|
2025-06-16 13:22:53 +08:00 |
|
|
|
de1ad8e06e
|
增加 修改
|
2025-06-16 13:22:20 +08:00 |
|
|
|
2d793324f1
|
解决突出
|
2025-06-16 13:15:11 +08:00 |
|
|
|
909a44682b
|
Merge branch 'dev-lzh' into dev
|
2025-06-16 13:09:37 +08:00 |
|
|
|
40c0a9d65f
|
Merge branch 'feature-multicast-daiyb' into dev
|
2025-06-16 11:06:32 +08:00 |
|
|
|
e9120402af
|
添加套餐金额类型
|
2025-06-16 11:06:17 +08:00 |
|
|
|
92364e194f
|
merge jng
|
2025-06-16 10:53:22 +08:00 |
|
|
|
abe68c7f6e
|
1
|
2025-06-16 10:37:18 +08:00 |
|
|
|
6c194a0646
|
作品类型判断
|
2025-06-16 10:20:18 +08:00 |
|
|
|
fe8f3498cd
|
fix: 调整代码，创建支付的时候加入创建对账单。支付成功通知时更新对账单
|
2025-06-16 10:04:27 +08:00 |
|
|
|
35712fdbe2
|
Merge branch 'feat-zjy-issue-008' into dev
# Conflicts:
# api/bundle/bundle.pb.go
# api/bundle/bundle_triple.pb.go
|
2025-06-16 10:03:06 +08:00 |
|
|
|
638f2a9554
|
fix: 调整代码，创建支付的时候加入创建对账单。支付成功通知时更新对账单
|
2025-06-16 09:56:09 +08:00 |
|
|
|
7747672842
|
Merge branch 'dev-lzh' into dev
|
2025-06-16 09:35:03 +08:00 |
|
|
|
1648689c02
|
Merge branch 'sxy-sec' into dev
|
2025-06-16 09:31:40 +08:00 |
|
|
|
549b5f05c6
|
增加 form list
|
2025-06-16 09:31:23 +08:00 |
|
|
|
c1ad440e83
|
提交时间类型修改
|
2025-06-16 09:04:45 +08:00 |
|
|
|
b3c8008b29
|
解决冲突
|
2025-06-15 23:23:11 +08:00 |
|
|
|
e370308b10
|
fix: 调整校验状态
|
2025-06-15 20:57:02 +08:00 |
|
|
|
cf18598b96
|
Merge branch 'jng' into feat-zjy-issue-008
# Conflicts:
# api/bundle/bundle.pb.go
|
2025-06-15 20:54:42 +08:00 |
|
|
|
c5ee0d1ae7
|
获取用户余量
|
2025-06-15 20:46:05 +08:00 |
|
|
|
f3e0ae8672
|
fix: update
|
2025-06-15 20:38:08 +08:00 |
|
|
|
aa6dca6f1f
|
fix: 处理冲突
|
2025-06-15 19:22:55 +08:00 |
|
|
|
ce95cface5
|
Merge branch 'feat-zjy-issue-008' into dev
# Conflicts:
# api/bundle/bundle.pb.go
# pkg/router/bundle.go
# pkg/service/bundle/bundleProfile.go
|
2025-06-15 19:22:14 +08:00 |
|
|
|
057565b0aa
|
fix: 新增接口，根据orderNo,仅查询它单独购买的增值服务，调整支付创建时候仅增值的情况
|
2025-06-15 19:19:10 +08:00 |
|
|
|
e23f39c6ac
|
fix: detail接口增加addBundle的字段
|
2025-06-15 18:32:36 +08:00 |
|
|
|
2276144fc4
|
Merge branch 'feat-zjy-issue-008' into dev
# Conflicts:
# api/bundle/bundle.pb.go
|
2025-06-15 18:31:52 +08:00 |
|
|
|
32cf742fa8
|
fix: detail接口增加addBundle的字段
|
2025-06-15 18:29:10 +08:00 |
|
|
|
7e9f25fffe
|
Merge branch 'dev-lzh' into dev
|
2025-06-15 15:54:04 +08:00 |
|
|
|
cc591a2e04
|
磁盘使用率接口
|
2025-06-15 15:53:57 +08:00 |
|
|
|
729c9e661c
|
解决冲突
|
2025-06-15 15:32:25 +08:00 |
|
|
|
8000f56c06
|
修改
|
2025-06-15 15:27:51 +08:00 |
|
|
|
2734e4572f
|
fix: 处理proto冲突
|
2025-06-15 14:55:09 +08:00 |
|
|
|
15ddf58f55
|
Merge branch 'feat-zjy-issue-008' into dev
# Conflicts:
# api/bundle/bundle.pb.go
# api/bundle/bundle_triple.pb.go
# docs/dev/dubbogo.yaml
# pkg/service/init.go
|
2025-06-15 14:53:47 +08:00 |
|
|
|
e26c9f0c51
|
fix: 调整创建支付的代码逻辑
|
2025-06-15 13:23:11 +08:00 |
|
|
|
3fbc1e6ef4
|
冲突解决
|
2025-06-15 12:54:02 +08:00 |
|
|
|
26c0056b12
|
Merge branch 'dev-lzh' into dev
|
2025-06-15 12:22:38 +08:00 |
|
