|
|
7ea988ccc5
|
解决冲突
|
2025-06-26 17:39:51 +08:00 |
|
|
|
7735b710dd
|
Merge branch 'dev-lzh'
|
2025-06-26 17:18:46 +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 |
|
|
|
2fc8ee5cb2
|
合并代码
|
2025-06-26 16:54:59 +08:00 |
|
|
|
fe9f4dcc95
|
调整资源原始文件鉴权
|
2025-06-26 16:12:50 +08:00 |
|
|
|
62efe6a80d
|
短信通知
|
2025-06-26 09:19:18 +08:00 |
|
|
|
ab135ed80e
|
修复作品确认接口的提前返回问题
|
2025-06-25 16:52:11 +08:00 |
|
|
|
cd40e1c9ca
|
Merge branch 'chat'
|
2025-06-25 15:53:57 +08:00 |
|
|
|
2ea9d6bc45
|
Update handler.go
|
2025-06-25 15:49:52 +08:00 |
|
|
|
9e3445319b
|
Update work.go
|
2025-06-25 14:16:21 +08:00 |
|
|
|
85567c24a5
|
Update work.go
|
2025-06-25 11:08: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 |
|
|
|
422b426c37
|
添加日志
|
2025-06-24 15:43:38 +08:00 |
|
|
|
786347f0d5
|
修改
|
2025-06-24 14:38:34 +08:00 |
|
|
|
490b0d7787
|
添加合同删除
|
2025-06-24 13:56:22 +08:00 |
|
|
|
62c48b2ea9
|
修改日志排序
|
2025-06-24 13:19:41 +08:00 |
|
|
|
090538be0d
|
修改
|
2025-06-24 10:55:59 +08:00 |
|
|
|
a6a04bf263
|
添加跨域支持
|
2025-06-24 09:42:17 +08:00 |
|
|
|
beb0ab72ab
|
确认列表过滤
|
2025-06-23 16:17:10 +08:00 |
|
|
|
382a32bec4
|
fix: 处理金额比较问题
|
2025-06-23 15:53:04 +08:00 |
|
|
|
94cf7ba83e
|
修改
|
2025-06-23 15:31:34 +08:00 |
|
|
|
0788c6a770
|
修改
|
2025-06-23 15:14:53 +08:00 |
|
|
|
7588bf4b28
|
绑定
|
2025-06-20 16:41:24 +08:00 |
|
|
|
a3f38b8377
|
修改
|
2025-06-20 15:51:16 +08:00 |
|
|
|
b51d4d39ca
|
Update approval.go
|
2025-06-20 13:32:44 +08:00 |
|
|
|
cf413538fa
|
fix: 处理bug
|
2025-06-20 11:48:20 +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 |
|
|
|
e663606c78
|
Update work.go
|
2025-06-20 11:11:49 +08:00 |
|
|
|
acf472f1ef
|
fix: 注掉没用信息，太强说会更新两次
|
2025-06-20 11:02:48 +08:00 |
|
|
|
7c6edab53d
|
fix: 去掉单独购买增值服务的0远金额限制
|
2025-06-20 10:23:32 +08:00 |
|
|
|
320e110f8c
|
补充缺失字段
|
2025-06-20 09:44:03 +08:00 |
|
|
|
8cfcbf345e
|
修改
|
2025-06-19 15:32:54 +08:00 |
|
|
|
a6e83c162d
|
添加扩展类型字段
|
2025-06-19 15:13:36 +08:00 |
|
|
|
c0be49a610
|
添加扩展类型字段
|
2025-06-19 15:13:15 +08:00 |
|
|
|
2facb5c0fb
|
Merge branch 'chat'
|
2025-06-19 15:07:05 +08:00 |
|
|
|
bc17428bd6
|
fix: 增加筛选过滤
|
2025-06-19 14:40:09 +08:00 |
|
|
|
301e94808d
|
Update chat.go
|
2025-06-19 14:23:01 +08:00 |
|
|
|
6eb8e2cef8
|
fix: 处理订单金额是0的情况,直接返回
|
2025-06-19 13:57:12 +08:00 |
|
|
|
293f3e5c09
|
fix: 修复不同类型的回复规则同时生效的问题
|
2025-06-19 12:34:54 +08:00 |
|
|
|
d1d305a638
|
fix: 找回丢失的代码
|
2025-06-19 11:31:15 +08:00 |
|
|
|
3a94e21ab3
|
Update robot.go
|
2025-06-19 11:13:50 +08:00 |
|
|
|
2757de0f03
|
fix: update
|
2025-06-19 11:12:15 +08:00 |
|
|
|
480551a738
|
添加重新发布
|
2025-06-19 11:04:37 +08:00 |
|
|
|
e1d750c24a
|
fix: 重构回复规则校验逻辑
|
2025-06-19 11:02:27 +08:00 |
|
