Commit Graph

587 Commits

Author SHA1 Message Date
sxy
23ef741181 Merge branch 'main' of https://gitea-inner.fontree.cn/fiee/fonchain-fiee 2025-06-26 17:47:45 +08:00
sxy
ef16bf69f9 "修改msg-冲突" 2025-06-26 17:47:24 +08:00
sxy
24fe5e3760 Merge branch 'sxy' 2025-06-26 17:46:33 +08:00
7ea988ccc5 解决冲突 2025-06-26 17:39:51 +08:00
lzh
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
lzh
fe9f4dcc95 调整资源原始文件鉴权 2025-06-26 16:12:50 +08:00
62efe6a80d 短信通知 2025-06-26 09:19:18 +08:00
lzh
ab135ed80e 修复作品确认接口的提前返回问题 2025-06-25 16:52:11 +08:00
f583a771d6 修改 2025-06-25 16:30:34 +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
23cf374c95 修改 2025-06-25 15:32:51 +08:00
lzh
b46286c584 更新proto 2025-06-25 15:23:55 +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
sxy
0d529d47db 修改套餐proto文件-1 2025-06-24 16:01:39 +08:00
44bff5db82 修改 2025-06-24 15:53:24 +08:00
422b426c37 添加日志 2025-06-24 15:43:38 +08:00
lzh
a3703f1d52 更新proto文件 2025-06-24 15:17:10 +08:00
786347f0d5 修改 2025-06-24 14:38:34 +08:00
sxy
a30636b387 修改套餐proto文件 2025-06-24 14:26:13 +08:00
490b0d7787 添加合同删除 2025-06-24 13:56:22 +08:00
a8f0107656 修改 2025-06-24 13:42:57 +08:00
62c48b2ea9 修改日志排序 2025-06-24 13:19:41 +08:00
090538be0d 修改 2025-06-24 10:55:59 +08:00
lzh
a6a04bf263 添加跨域支持 2025-06-24 09:42:17 +08:00
sxy
4344f1ff2c 修改多语言msg 2025-06-23 16:28:39 +08:00
lzh
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
sxy
e53d3decd7 修改多语言msg-1 2025-06-20 15:30:27 +08:00
sxy
81115cee52 修改多语言msg 2025-06-20 14:57:53 +08:00
b51d4d39ca Update approval.go 2025-06-20 13:32:44 +08:00
sxy
42eac3d70b 修改bug-msg 2025-06-20 13:10:00 +08:00
cf413538fa fix: 处理bug 2025-06-20 11:48:20 +08:00
42522327a5 1 2025-06-20 11:46:06 +08:00
sxy
051f4d9f1d 修改bug 2025-06-20 11:42:04 +08:00
c20c6871c9 fix: 处理冲突,增加自行购买 2025-06-20 11:26:16 +08:00