|
|
7ea988ccc5
|
解决冲突
|
2025-06-26 17:39:51 +08:00 |
|
|
|
7735b710dd
|
Merge branch 'dev-lzh'
|
2025-06-26 17:18:46 +08:00 |
|
|
|
9546978e3c
|
fix: 处理pb冲突
|
2025-06-26 17:10:01 +08:00 |
|
|
|
bbf093e104
|
Merge branch 'feat-zjy-issue-008' into main
# Conflicts:
# api/bundle/bundle.pb.go
# api/bundle/bundle_triple.pb.go
# docs/dev/dubbogo.yaml
# pkg/router/bundle.go
# pkg/service/init.go
|
2025-06-26 17:07:16 +08:00 |
|
|
|
4af106da5d
|
Update bundle.validator.pb.go
|
2025-06-26 16:56:44 +08:00 |
|
|
|
2fc8ee5cb2
|
合并代码
|
2025-06-26 16:54:59 +08:00 |
|
|
|
62efe6a80d
|
短信通知
|
2025-06-26 09:19:18 +08:00 |
|
|
|
f583a771d6
|
修改
|
2025-06-25 16:30:34 +08:00 |
|
|
|
23cf374c95
|
修改
|
2025-06-25 15:32:51 +08:00 |
|
|
|
b46286c584
|
更新proto
|
2025-06-25 15:23:55 +08:00 |
|
|
|
ce9deac980
|
1
|
2025-06-25 10:25:24 +08:00 |
|
|
|
e0d7b3775c
|
添加作品数量
|
2025-06-24 18:27:55 +08:00 |
|
|
|
b9ca6c67ef
|
添加取号
|
2025-06-24 16:38:26 +08:00 |
|
|
|
3890d74c0c
|
添加取号
|
2025-06-24 16:33:06 +08:00 |
|
|
|
b5ec90382f
|
1
|
2025-06-24 16:01:50 +08:00 |
|
|
|
44bff5db82
|
修改
|
2025-06-24 15:53:24 +08:00 |
|
|
|
a3703f1d52
|
更新proto文件
|
2025-06-24 15:17:10 +08:00 |
|
|
|
786347f0d5
|
修改
|
2025-06-24 14:38:34 +08:00 |
|
|
|
490b0d7787
|
添加合同删除
|
2025-06-24 13:56:22 +08:00 |
|
|
|
a8f0107656
|
修改
|
2025-06-24 13:42:57 +08:00 |
|
|
|
7588bf4b28
|
绑定
|
2025-06-20 16:41:24 +08:00 |
|
|
|
a3f38b8377
|
修改
|
2025-06-20 15:51:16 +08:00 |
|
|
|
42522327a5
|
1
|
2025-06-20 11:46:06 +08:00 |
|
|
|
c20c6871c9
|
fix: 处理冲突，增加自行购买
|
2025-06-20 11:26:16 +08:00 |
|
|
|
383f8bef10
|
Merge branch 'jng' into feat-zjy-issue-008
# Conflicts:
# api/bundle/bundle.pb.go
# api/bundle/bundle_triple.pb.go
|
2025-06-20 11:21:22 +08:00 |
|
|
|
320e110f8c
|
补充缺失字段
|
2025-06-20 09:44:03 +08:00 |
|
|
|
8cfcbf345e
|
修改
|
2025-06-19 15:32:54 +08:00 |
|
|
|
dff14a45be
|
更新proto文件
|
2025-06-19 15:12:32 +08:00 |
|
|
|
2facb5c0fb
|
Merge branch 'chat'
|
2025-06-19 15:07:05 +08:00 |
|
|
|
686a57ebc5
|
更新proto文件
|
2025-06-19 15:06:01 +08:00 |
|
|
|
480551a738
|
添加重新发布
|
2025-06-19 11:04:37 +08:00 |
|
|
|
eebaada8f6
|
修改protoc版本
|
2025-06-17 21:29:00 +08:00 |
|
|
|
5aaf8d92bf
|
Merge branch 'sxy-sec'
|
2025-06-17 18:33:52 +08:00 |
|
|
|
8d28627e5f
|
修改接口认证
|
2025-06-17 14:46:09 +08:00 |
|
|
|
5ad6d318e0
|
添加确认变更的接口
|
2025-06-17 14:27:43 +08:00 |
|
|
|
d14dbaaf99
|
修改官网数据
|
2025-06-17 14:07:30 +08:00 |
|
|
|
4643de4f6e
|
fix: 修复role没有值的问题
|
2025-06-17 11:21:53 +08:00 |
|
|
|
55c74ea17c
|
fix: 修复卡片类型内容不展示
|
2025-06-16 15:51:52 +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 |
|
|
|
638f2a9554
|
fix: 调整代码，创建支付的时候加入创建对账单。支付成功通知时更新对账单
|
2025-06-16 09:56:09 +08:00 |
|
|
|
549b5f05c6
|
增加 form list
|
2025-06-16 09:31:23 +08:00 |
|
|
|
c1ad440e83
|
提交时间类型修改
|
2025-06-16 09:04:45 +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 |
|
|
|
057565b0aa
|
fix: 新增接口，根据orderNo,仅查询它单独购买的增值服务，调整支付创建时候仅增值的情况
|
2025-06-15 19:19:10 +08:00 |
|
