Commit Graph

Select branches

Hide Pull Requests

chat

dev

dev-lzh

feat-antom-pay-zjy

feat-zjy-copy-employee

feat-zjy-fix-paymentcent-proto

feat-zjy-fixbug-003

feat-zjy-issue-008

feat-zjy-issue-013

feature-multicast-daiyb

jng

main

main-out

sc

sxy

sxy-fix

sxy-sec

1.0.3

1.0.4

1.0.5

1.0.6

1.0.7

1.0.8

1.0.9

1.01

1.1.0

10.2

Mono Color

• 11bc39be1b Merge branch 'jng' into dev dev 桀尼龟 2025-07-11 09:40:20 +0800
• b86e759146 修改 main jng 桀尼龟 2025-07-11 09:39:44 +0800
• ac7dd44fd9 Merge branch 'jng' into dev 桀尼龟 2025-07-08 16:21:20 +0800
• fa468e0130 修改 桀尼龟 2025-07-08 16:21:06 +0800
• 403f065486 11 桀尼龟 2025-07-08 16:18:46 +0800
• b33a776f93 解决冲突 桀尼龟 2025-07-08 16:14:17 +0800
• 54326ebe01 对账单添加手续费 桀尼龟 2025-07-08 16:13:30 +0800
• 9c6f1ae832 fix: 处理pb zhoujunyao 2025-07-08 15:22:58 +0800
• 80e45457ec Merge branch 'feat-zjy-issue-013' into main zhoujunyao 2025-07-08 15:21:49 +0800
• 866cce5bb6 Merge branch 'feat-zjy-issue-013' into dev 桀尼龟 2025-07-08 14:57:25 +0800
• 6bb22e019a 修改 feat-zjy-issue-013 桀尼龟 2025-07-08 14:57:12 +0800
• fe6ac1be55 解决冲突 桀尼龟 2025-07-08 14:20:38 +0800
• 7d6f141d4e 111 桀尼龟 2025-07-08 14:19:54 +0800
• eba1083fe7 修改 桀尼龟 2025-07-08 14:18:26 +0800
• 2c2c9499cc Merge branch 'feat-zjy-issue-013' into dev 桀尼龟 2025-07-08 13:51:40 +0800
• f36fadb1bf 修改 桀尼龟 2025-07-08 13:51:27 +0800
• b2012fbaba Merge branch 'feat-zjy-issue-013' into dev 桀尼龟 2025-07-08 13:40:29 +0800
• 78279cbc82 修改 桀尼龟 2025-07-08 13:40:15 +0800
• bc1bdf1fc0 Merge branch 'sxy-sec' "官网sec文件" sxy 2025-07-08 13:07:11 +0800
• bc9d7fe7ba Merge branch 'sxy-sec' into dev "修改" sxy 2025-07-08 13:03:13 +0800
• 817c685190 修改官网link sxy-sec sxy 2025-07-08 13:02:54 +0800
• 8e4a087310 Merge branch 'feat-zjy-issue-013' into dev zhoujunyao 2025-07-08 11:59:33 +0800
• 46957da638 fix: 提交支持自动创建用户和订单代码- 调整映射map zhoujunyao 2025-07-08 11:59:13 +0800
• e9c46e4a64 Merge remote-tracking branch 'origin/dev' into dev zhoujunyao 2025-07-08 11:52:00 +0800
• d55abc66db Merge branch 'feat-zjy-issue-013' into dev zhoujunyao 2025-07-08 11:51:18 +0800
• 314891e85b fix: 提交支持自动创建用户和订单代码- 打印日志 zhoujunyao 2025-07-08 11:50:15 +0800
• 4177a676b9 Merge branch 'sxy-sec' into dev "修改sec" sxy 2025-07-08 11:48:49 +0800
• c3009b2086 修改官网link sxy 2025-07-08 11:47:22 +0800
• 2bc6a4f77c Merge branch 'feat-zjy-issue-013' into dev zhoujunyao 2025-07-08 11:18:04 +0800
• 57f10eb7b9 fix: 提交支持自动创建用户和订单代码- 调整map zhoujunyao 2025-07-08 11:17:39 +0800
• d8c083f5b6 Merge branch 'feat-zjy-issue-013' into dev zhoujunyao 2025-07-08 10:46:17 +0800
• 13688ddeb2 fix: 提交支持自动创建用户和订单代码-0元购的serial_number调整 zhoujunyao 2025-07-08 10:44:55 +0800
• 0f1559f1cf Merge branch 'feat-zjy-issue-013' into dev zhoujunyao 2025-07-08 10:23:58 +0800
• e734fadfc6 fix: 提交支持自动创建用户和订单代码-子订单初始化的时候是未支付 zhoujunyao 2025-07-08 10:23:08 +0800
• d4bc9bae54 Merge branch 'feat-zjy-issue-013' into dev 桀尼龟 2025-07-08 09:46:35 +0800
• 96e3ddda46 修改 桀尼龟 2025-07-08 09:45:50 +0800
• 82e5f92be2 解决冲突 桀尼龟 2025-07-07 19:37:04 +0800
• 493624dfcb 添加excel导入 桀尼龟 2025-07-07 19:35:54 +0800
• 9f03ac444e 合并数据 daiyb 2025-07-07 15:34:00 +0800
• cdf4b77aa7 Update dubbogo.yaml daiyb 2025-07-07 15:28:30 +0800
• f6164cd455 fix: 提交支持自动创建用户和订单代码 zhoujunyao 2025-07-07 13:32:19 +0800
• 7c2f3b5545 proto更新 feature-multicast-daiyb lzh 2025-07-07 11:59:28 +0800
• dd25bb3f4e Merge branch 'dev-lzh' into dev lzh 2025-07-07 10:48:37 +0800
• cd9cd0dbd1 更新proto dev-lzh lzh 2025-07-07 10:48:06 +0800
• 173cb0af0f Merge branch 'jng' 桀尼龟 2025-07-03 16:53:51 +0800
• eda4d7dd91 Merge branch 'jng' into dev 桀尼龟 2025-07-03 16:53:33 +0800
• d03049762f 修改 桀尼龟 2025-07-03 16:53:08 +0800
• f1bb8d54ca Merge branch 'jng' 桀尼龟 2025-07-03 16:12:17 +0800
• b761411203 Merge branch 'jng' into dev 桀尼龟 2025-07-03 16:06:30 +0800
• aecd26d08c 11 桀尼龟 2025-07-03 16:05:48 +0800
• 07309ab587 Merge branch 'jng' into dev 桀尼龟 2025-07-03 16:02:28 +0800
• 3c618f52c8 修改 桀尼龟 2025-07-03 16:02:06 +0800
• 852d2fbed4 Merge branch 'jng' into dev 桀尼龟 2025-07-03 15:51:15 +0800
• e7b3fe54bd 修改 桀尼龟 2025-07-03 15:50:53 +0800
• db9edc057d Merge branch 'jng' 桀尼龟 2025-07-02 15:36:42 +0800
• b458105c4c Merge branch 'jng' into dev 桀尼龟 2025-07-02 15:33:47 +0800
• a0afa6f17a 修改 桀尼龟 2025-07-02 15:33:22 +0800
• db193ce55a Merge branch 'jng' into dev 桀尼龟 2025-07-02 14:02:33 +0800
• 3e003ca581 修改 桀尼龟 2025-07-02 14:02:10 +0800
• bb7184c480 Merge branch 'feat-zjy-fixbug-003' into main zhoujunyao 2025-06-27 17:44:55 +0800
• 633c903f33 fix: 处理对账单金额问题 feat-zjy-fixbug-003 zhoujunyao 2025-06-27 17:43:09 +0800
• eea1b146eb Merge branch 'main' of http://172.16.100.91:3000/fiee/fonchain-fiee daiyb 2025-06-27 17:19:27 +0800
• 6848e73ac6 管理人是我 daiyb 2025-06-27 17:19:22 +0800
• f0c81cc22f Merge branch 'sxy-fix' sxy 2025-06-27 15:59:45 +0800
• 6406396d75 修改路由认证-1 sxy-fix sxy 2025-06-27 15:59:28 +0800
• b8e9353a99 Merge branch 'feat-zjy-fixbug-003' into main zhoujunyao 2025-06-27 15:51:18 +0800
• 58abfab434 fix: 处理对账单金额问题 zhoujunyao 2025-06-27 15:50:17 +0800
• 8f5caf80bf 修改审批接口 daiyb 2025-06-27 15:31:39 +0800
• d1181e4460 修改 桀尼龟 2025-06-27 14:58:39 +0800
• d71d77647f 1 gy 2025-06-27 11:54:15 +0800
• 7934b253b0 修改路由认证 sxy 2025-06-27 11:11:17 +0800
• 5caf271d18 修改路由 sxy 2025-06-27 10:52:35 +0800
• 06e764dfd1 "修改路由重复-冲突" sxy 2025-06-26 18:22:35 +0800
• 23ef741181 Merge branch 'main' of https://gitea-inner.fontree.cn/fiee/fonchain-fiee sxy 2025-06-26 17:47:45 +0800
• ef16bf69f9 "修改msg-冲突" sxy 2025-06-26 17:47:24 +0800
• 24fe5e3760 Merge branch 'sxy' sxy 2025-06-26 17:46:33 +0800
• 7ea988ccc5 解决冲突 桀尼龟 2025-06-26 17:39:51 +0800
• 7735b710dd Merge branch 'dev-lzh' lzh 2025-06-26 17:18:46 +0800
• 9546978e3c fix: 处理pb冲突 zhoujunyao 2025-06-26 17:10:01 +0800
• bbf093e104 Merge branch 'feat-zjy-issue-008' into main zhoujunyao 2025-06-26 17:07:16 +0800
• 4af106da5d Update bundle.validator.pb.go daiyb 2025-06-26 16:56:44 +0800
• 2fc8ee5cb2 合并代码 daiyb 2025-06-26 16:54:59 +0800
• a16f0b6d54 Merge branch 'dev-lzh' into dev lzh 2025-06-26 16:12:58 +0800
• fe9f4dcc95 调整资源原始文件鉴权 lzh 2025-06-26 16:12:50 +0800
• 87db2d6ce3 Merge branch 'feature-multicast-daiyb' into dev daiyb 2025-06-26 09:21:32 +0800
• 62efe6a80d 短信通知 daiyb 2025-06-26 09:19:18 +0800
• 5ae25cabc6 添加日志打印 lzh 2025-06-26 09:08:08 +0800
• e4d6b5de90 Merge branch 'dev-lzh' into dev lzh 2025-06-25 16:52:19 +0800
• ab135ed80e 修复作品确认接口的提前返回问题 lzh 2025-06-25 16:52:11 +0800
• afcc29ba80 Merge branch 'jng' into dev 桀尼龟 2025-06-25 16:31:32 +0800
• f583a771d6 修改 桀尼龟 2025-06-25 16:30:34 +0800
• cd40e1c9ca Merge branch 'chat' jjxu 2025-06-25 15:53:57 +0800
• df3c90476b Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev jjxu 2025-06-25 15:51:30 +0800
• 4cc70d4b2f Merge branch 'chat' into dev jjxu 2025-06-25 15:50:03 +0800
• 2ea9d6bc45 Update handler.go jjxu 2025-06-25 15:49:52 +0800
• ada34794e3 解决冲突 桀尼龟 2025-06-25 15:34:14 +0800
• 23cf374c95 修改 桀尼龟 2025-06-25 15:32:51 +0800
• ea89bdbe02 Merge branch 'dev-lzh' into dev lzh 2025-06-25 15:24:33 +0800
• b46286c584 更新proto lzh 2025-06-25 15:23:55 +0800
• 9e3445319b Update work.go daiyb 2025-06-25 14:16:21 +0800