Commit Graph

Select branches

Hide Pull Requests

chat

dev

dev-lzh

feat-antom-pay-zjy

feat-sxy-import

feat-zjy-copy-employee

feat-zjy-fix-paymentcent-proto

feat-zjy-fixbug-003

feat-zjy-fixbug-006

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

• c135849195 Merge branch 'feature-multicast-daiyb' main daiyb 2025-08-13 09:18:53 +0800
• 7488f76c08 Merge branch 'feat-sxy-import' sxy 2025-08-13 09:17:03 +0800
• 4616d066d8 Merge branch 'feat-sxy-import' into dev dev sxy 2025-08-12 17:02:56 +0800
• bca6eb9009 修改 feat-sxy-import sxy 2025-08-12 17:02:32 +0800
• 8aab8ff4e6 更新 pkg/service/upload/upload.go 周俊耀 2025-08-12 06:03:27 +0000
• 857b7712ae Merge branch 'jng' 桀尼龟 2025-08-12 13:35:23 +0800
• 69bbc5a090 Merge branch 'jng' into dev 桀尼龟 2025-08-12 12:00:21 +0800
• adb956dacb update oss config jng 桀尼龟 2025-08-12 11:59:31 +0800
• db0c064828 Merge branch 'feat-sxy-import' into dev sxy 2025-08-12 10:25:15 +0800
• e7f8993fa5 记录时间和uuid sxy 2025-08-12 10:24:48 +0800
• 6773cc62e7 Merge branch 'feat-sxy-import' into dev sxy 2025-08-11 16:58:47 +0800
• eaa48b9d5e 过滤特殊数据处理-1 sxy 2025-08-11 16:58:35 +0800
• 454d40cfd9 Merge branch 'dev' of https://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev sxy 2025-08-11 16:42:42 +0800
• 935dc4bc2c Merge branch 'feat-sxy-import' into dev sxy 2025-08-11 16:42:33 +0800
• bd59b2dc69 过滤特殊数据处理 sxy 2025-08-11 16:42:13 +0800
• b063a38f76 Merge branch 'jng' 桀尼龟 2025-08-11 16:41:50 +0800
• 2151020f1a 解决冲突 桀尼龟 2025-08-11 16:29:05 +0800
• 6c4578b8aa update oss config 桀尼龟 2025-08-11 16:27:26 +0800
• d48b6fae1b Merge branch 'feat-sxy-import' into dev sxy 2025-08-11 16:08:47 +0800
• 9bf59916a6 修改查询条件 sxy 2025-08-11 16:08:35 +0800
• 0e458dc4e7 Merge branch 'feat-sxy-import' into dev sxy 2025-08-11 15:50:34 +0800
• 2c49b28d0f 修改查询条件 sxy 2025-08-11 15:50:18 +0800
• a8e2e4dfe2 Merge branch 'feat-sxy-import' into dev sxy 2025-08-11 15:30:09 +0800
• 3c964140f3 导入数据脚本-1 sxy 2025-08-11 15:29:54 +0800
• 1a9d6c0ede Merge branch 'feat-sxy-import' into dev sxy 2025-08-11 13:30:25 +0800
• c20e90d45a 导入数据脚本 sxy 2025-08-11 13:29:49 +0800
• 11592d8c90 Merge branch 'feature-multicast-daiyb' into dev daiyb 2025-08-07 11:59:37 +0800
• 25eed16be5 添加source feature-multicast-daiyb daiyb 2025-08-07 11:59:25 +0800
• 2d7269148a 修改symbol-1 sxy 2025-07-31 14:11:20 +0800
• e9d74c99fb 修改sec symbol-1 sxy-sec sxy 2025-07-31 14:11:05 +0800
• 512bfe4d15 修改symbol sxy 2025-07-31 13:43:31 +0800
• d2ef31f289 修改sec symbol sxy 2025-07-31 13:42:28 +0800
• 2ff956bb30 fix: map中增加两个新金额 feat-zjy-fixbug-006 zhoujunyao 2025-07-17 14:23:17 +0800
• 3ff698e94f Merge branch 'jng' 桀尼龟 2025-07-16 19:27:48 +0800
• 2846cdc1b2 Merge branch 'jng' into dev 桀尼龟 2025-07-16 17:54:38 +0800
• 130bb26ebf 修改 桀尼龟 2025-07-16 17:54:15 +0800
• f672ecf670 Merge branch 'sxy-sec' "x修改symbol" sxy 2025-07-16 10:45:46 +0800
• a68ba46e51 Merge branch 'sxy-sec' into dev "修改symbol" sxy 2025-07-16 10:45:03 +0800
• 2220a78c19 修改官网symbol sxy 2025-07-16 10:44:43 +0800
• 36aaa0a365 fix: map中增加两个新金额 zhoujunyao 2025-07-15 10:31:53 +0800
• 11bc39be1b Merge branch 'jng' into dev 桀尼龟 2025-07-11 09:40:20 +0800
• b86e759146 修改 桀尼龟 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 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更新 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