Commit Graph

82 Commits

Author SHA1 Message Date
9f03ac444e 合并数据 2025-07-07 15:34:00 +08:00
cdf4b77aa7 Update dubbogo.yaml 2025-07-07 15:28:30 +08:00
8f5caf80bf 修改审批接口 2025-06-27 15:31:39 +08:00
gy
d71d77647f 1 2025-06-27 11:54:15 +08:00
2fc8ee5cb2 合并代码 2025-06-26 16:54:59 +08:00
0545372341 Merge branch 'feature-multicast-daiyb' into dev 2025-06-24 16:38:41 +08:00
3890d74c0c 添加取号 2025-06-24 16:33:06 +08:00
2facb5c0fb Merge branch 'chat' 2025-06-19 15:07:05 +08:00
lzh
e250a5dbc9 忽略未上线消费者 2025-06-17 19:45:50 +08:00
lzh
096f691067 忽略未上线消费者 2025-06-17 19:43:47 +08:00
sxy
5aaf8d92bf Merge branch 'sxy-sec' 2025-06-17 18:33:52 +08:00
dc8a872e5e Update conf.ini 2025-06-17 10:28:07 +08:00
c796d3f507 fix: 修改oss配置 2025-06-17 10:26:59 +08:00
79a61043e9 Update conf.ini 2025-06-17 10:20:19 +08:00
17b8f61968 Merge branch 'chat' into dev 2025-06-17 10:14:40 +08:00
9460473581 Update conf.ini 2025-06-17 10:10:59 +08:00
cc295e64b5 Merge branch 'chat' into dev 2025-06-17 10:06:38 +08:00
6558e373c6 修改测试环境oss配置 2025-06-17 10:06:27 +08:00
aecacb623b 解决冲突 2025-06-16 16:11:55 +08:00
cee0d67de1 fix: 更新配置 2025-06-16 16:10:48 +08:00
bf21a5b906 Update conf.ini 2025-06-15 18:36:14 +08:00
63620fdda4 fix: 修复domain配置错误的问题 2025-06-15 18:35:08 +08:00
f10b996656 fix: update 2025-06-15 18:34:17 +08:00
8ad73a8874 fix: 调整配置文件,只能dev改,master上没有 2025-06-15 15:03:53 +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
59ed859aae fix: 调整支付配置文件 2025-06-15 14:50:26 +08:00
e879989ef6 fix: update 2025-06-14 18:12:13 +08:00
6fd82f1770 fix: 修改domain 2025-06-14 18:11:31 +08:00
829928da9b 添加审批 2025-06-13 19:02:00 +08:00
129d3fafa1 更新审批 2025-06-13 19:00:38 +08:00
sxy
efdebf8949 Merge branch 'sxy-sec' into dev 2025-06-13 10:49:32 +08:00
sxy
63da647619 修改冲突 2025-06-13 10:45:30 +08:00
sxy
49a935d6c6 修改 2025-06-13 10:34:36 +08:00
347b97f9d9 添加详情 2025-06-12 11:38:19 +08:00
d6fd804005 Update conf.ini 2025-06-11 10:25:26 +08:00
19b5a693d2 Update conf.ini 2025-06-11 10:24:33 +08:00
99520e87d4 完成账号更新 2025-06-06 14:15:37 +08:00
78f4a98993 merge main 2025-06-06 11:44:06 +08:00
4aaa28f1d7 11 2025-05-26 17:16:48 +08:00
01724622b9 修改 2025-05-26 17:03:07 +08:00
3df1e05aef 修改 2025-05-26 16:31:38 +08:00
26ed034734 fix: 处理dubbo文件问题 2025-04-14 18:28:07 +08:00
2131894c7f fix: 回退 2025-04-14 18:05:02 +08:00
df3ad7fd57 fix: 调整dubbo配置 2025-04-14 17:59:52 +08:00
191011fa53 fix: 调整配置 2025-04-14 16:35:39 +08:00
e869c22742 fix: 切换antom支付 2025-04-14 16:12:37 +08:00
songchuang
5b163feada Merge branch 'dev' 2025-03-29 08:35:12 +08:00
jhc
93cda03195 xiugai 2025-03-28 21:52:49 +08:00
jhc
f2d2b9ccd5 修改 2025-03-28 21:47:11 +08:00
308b4f044d 更新 docs/prod/conf.ini
fiee,stripe把德国切美国
2025-03-28 11:06:05 +00:00