Commit Graph

Select branches

Hide Pull Requests

dev

dev-lzh

dev-lzh-0905

feat-cjy-taskBanch

feat-cjy-taskBench

feat-hjj-packageManage#A116

feat-zjy-fixbug

feat-zjy-issue-008

feat-zjy-issue-013

jng

main

sc

status

sxy

1.0.4

1.0.5

1.01

1.02

1.03

Mono Color

• 5394e81a3a Revert "Merge branch 'sxy' into dev" sxy 2025-06-19 16:04:48 +0800
• 988d1342f5 Merge branch 'sxy' into dev sxy 2025-06-19 16:04:14 +0800
• fec7641edb 修改h5套餐列表-1 sxy 2025-06-19 16:04:00 +0800
• f2332671aa Merge branch 'dev-lzh' into dev lzh 2025-06-19 16:01:37 +0800
• 0dce0b80a6 余量套餐状态添加 lzh 2025-06-19 16:00:51 +0800
• 7b12a726fd Merge branch 'sxy' into dev sxy 2025-06-19 16:00:05 +0800
• 0057fa5856 修改h5套餐列表 sxy 2025-06-19 15:59:54 +0800
• 360b1377a8 Merge branch 'sxy' into dev sxy 2025-06-19 15:58:31 +0800
• e081b5f23b 修改h5套餐列表 sxy 2025-06-19 15:58:11 +0800
• 505f459d89 Merge branch 'dev-lzh' into dev lzh 2025-06-19 15:54:02 +0800
• b151326427 余量信息电话号码添加 lzh 2025-06-19 15:53:56 +0800
• e7727141d8 修改h5套餐列表 sxy 2025-06-19 15:52:24 +0800
• 829891cb7c Revert "Merge branch 'sxy' into dev" sxy 2025-06-19 15:47:44 +0800
• 1883adf5b5 Merge branch 'sxy' into dev sxy 2025-06-19 15:46:55 +0800
• 5086802f1b 修改h5套餐列表 sxy 2025-06-19 15:46:29 +0800
• fdf2d5a09b 修改h5列表 sxy 2025-06-19 15:44:55 +0800
• 044f79575c 解决冲突 桀尼龟 2025-06-19 15:29:41 +0800
• c537e1e50c 修改 桀尼龟 2025-06-19 15:26:08 +0800
• 5e2fa0e7a0 更新proto lzh 2025-06-19 15:10:30 +0800
• 33cd40fafa Merge branch 'dev-lzh' into dev lzh 2025-06-19 15:10:11 +0800
• 3d226f9c8d 更新proto文件 lzh 2025-06-19 15:09:16 +0800
• e52b81f5c7 Merge branch 'dev-lzh' into dev lzh 2025-06-19 15:03:02 +0800
• a6fddccda9 添加扩展类型字段 lzh 2025-06-19 14:52:54 +0800
• 46c62fa213 Merge branch 'sxy' into dev sxy 2025-06-19 14:23:18 +0800
• 53fdc7c4b6 修改套餐同步更新 sxy 2025-06-19 14:22:57 +0800
• eacfce8ea6 Merge branch 'sxy' into dev sxy 2025-06-19 11:47:15 +0800
• eac7c759f6 修改错误信息返回 sxy 2025-06-19 11:46:53 +0800
• 000de78286 修改错误信息返回 sxy 2025-06-19 11:43:54 +0800
• 883e5613e6 Merge branch 'dev-lzh' into dev lzh 2025-06-18 16:47:34 +0800
• df0b742168 过滤空余量信息 lzh 2025-06-18 16:47:28 +0800
• 289518d2f9 Merge branch 'dev-lzh' into dev lzh 2025-06-18 16:37:09 +0800
• a71942b0d4 过滤软删除的记录 lzh 2025-06-18 16:37:01 +0800
• e5255d3022 Merge branch 'dev-lzh' into dev lzh 2025-06-18 16:36:04 +0800
• 370f0a08c1 过滤软删除的记录 lzh 2025-06-18 16:35:55 +0800
• 46839556cd Merge branch 'sxy' into dev sxy 2025-06-18 16:18:46 +0800
• 90928cf5c8 修改查询-1 sxy 2025-06-18 16:18:31 +0800
• a3e999f345 Merge branch 'sxy' into dev sxy 2025-06-18 16:03:27 +0800
• 3cce79adab 修改查询 sxy 2025-06-18 16:03:14 +0800
• df96102509 Merge branch 'sxy' into dev sxy 2025-06-18 15:49:43 +0800
• 6107e35aca 修改 sxy 2025-06-18 15:49:21 +0800
• 412e679b94 Merge branch 'sxy' into dev sxy 2025-06-18 11:42:56 +0800
• 4c027c4a08 修改 sxy 2025-06-18 11:42:39 +0800
• fc396fd909 Merge branch 'dev-lzh' into dev lzh 2025-06-17 16:09:46 +0800
• 2a137ad3fb 修改查询条件 lzh 2025-06-17 16:09:38 +0800
• 3fae4f4ab7 modified: internal/dao/bundleExtend.go lzh 2025-06-17 14:39:39 +0800
• ebb08194d6 修改时间类型 lzh 2025-06-17 14:38:52 +0800
• 19ac6f4bf3 Merge branch 'dev-lzh' into dev lzh 2025-06-17 14:15:36 +0800
• 32de65196b 添加确认状态 lzh 2025-06-17 14:14:09 +0800
• 5e6f69bacf Merge branch 'sxy' into dev sxy 2025-06-17 09:26:29 +0800
• 379cc1b1e7 增加clor-1 sxy 2025-06-17 09:26:09 +0800
• 0c5ffdcc90 增加clor sxy 2025-06-17 09:24:18 +0800
• 412350cf8a 修改错误信息 lzh 2025-06-16 14:29:18 +0800
• 8ce0c39fb1 Merge branch 'dev-lzh' into dev lzh 2025-06-16 13:41:37 +0800
• 8a14905343 添加金额类型 lzh 2025-06-16 13:40:50 +0800
• cb76c941dd 冲突解决 lzh 2025-06-16 13:34:30 +0800
• e1ecefba63 Merge branch 'feat-zjy-issue-008' into dev zhoujunyao 2025-06-16 13:25:58 +0800
• 38f03838a5 fix: 根据orderNo只查询增值服务接口的source写错了 feat-zjy-issue-008 zhoujunyao 2025-06-16 13:25:22 +0800
• 0da63da9d8 Merge branch 'sxy' into dev sxy 2025-06-16 13:21:19 +0800
• 8793f023c9 增加批量获取增值服务-1 sxy 2025-06-16 13:20:54 +0800
• 9bffde4a62 增加批量获取增值服务 sxy 2025-06-16 13:13:27 +0800
• ede67efea9 Merge branch 'dev' of https://gitea-inner.fontree.cn/fiee/micro-bundle into dev sxy 2025-06-16 11:54:33 +0800
• 665afeced0 Merge branch 'sxy' into dev sxy 2025-06-16 11:54:18 +0800
• 8b2e7c541e 修改验证 sxy 2025-06-16 11:54:04 +0800
• 7c12b60c32 Merge branch 'feat-zjy-issue-008' into dev zhoujunyao 2025-06-16 11:08:53 +0800
• 8fe2ea816f fix: 调整order-detail接口，可以根据token直接捞到子订单 zhoujunyao 2025-06-16 11:08:16 +0800
• 07b6296867 添加金额类型 lzh 2025-06-16 11:05:18 +0800
• 56dee3eb9d Merge branch 'dev-lzh' into dev lzh 2025-06-16 10:58:51 +0800
• 8c36da313e 时间格式修改 lzh 2025-06-16 10:58:45 +0800
• e4445ebf5b Merge branch 'dev-lzh' into dev lzh 2025-06-16 10:55:25 +0800
• 1d9b8bda3a 删除调试 lzh 2025-06-16 10:55:15 +0800
• 1504285bc8 Merge branch 'dev-lzh' into dev lzh 2025-06-16 10:52:37 +0800
• 2fe368cace 时间格式修改 lzh 2025-06-16 10:52:30 +0800
• d6cc359a36 fix: 新增接口，根据对账单流水号更新对账单支付状态和支付时间。创建对账单根据对账单流水号去重 zhoujunyao 2025-06-16 10:02:20 +0800
• 6829778c8c fix: 新增接口，根据对账单流水号更新对账单支付状态和支付时间。创建对账单根据对账单流水号去重 zhoujunyao 2025-06-16 10:01:51 +0800
• 346206b1d3 Merge branch 'feat-zjy-issue-008' into dev zhoujunyao 2025-06-16 10:01:25 +0800
• 28d92a6ca2 添加日志打印 lzh 2025-06-16 09:57:20 +0800
• 335f8589ad Merge branch 'dev-lzh' into dev lzh 2025-06-16 09:55:47 +0800
• 7367bf1639 默认过期时间使用当前时间 lzh 2025-06-16 09:55:29 +0800
• fb413f80bc fix: 新增接口，根据对账单流水号更新对账单支付状态和支付时间。创建对账单根据对账单流水号去重 zhoujunyao 2025-06-16 09:52:20 +0800
• a939b53340 Merge branch 'dev-lzh' into dev lzh 2025-06-16 09:04:11 +0800
• 6c7a1f9d44 提交时间类型修改 lzh 2025-06-16 09:03:39 +0800
• c8e6c459f1 fix: 新增接口，根据orderNo,仅查询它单独购买的增值服务 zhoujunyao 2025-06-15 19:20:31 +0800
• 4231fdd1f9 Merge branch 'feat-zjy-issue-008' into dev zhoujunyao 2025-06-15 19:20:01 +0800
• cb21e13c4e fix: 新增接口，根据orderNo,仅查询它单独购买的增值服务 zhoujunyao 2025-06-15 19:15:30 +0800
• 76641cd124 Merge branch 'feat-zjy-issue-008' into dev zhoujunyao 2025-06-15 18:49:19 +0800
• 5205119945 fix: 处理bug zhoujunyao 2025-06-15 18:49:06 +0800
• 42bd5409f6 fix: detail接口增加addBundle的字段 zhoujunyao 2025-06-15 18:31:18 +0800
• f9e7f9e13c Merge branch 'feat-zjy-issue-008' into dev zhoujunyao 2025-06-15 18:30:54 +0800
• 50b4009043 fix: detail接口增加addBundle的字段 zhoujunyao 2025-06-15 18:29:01 +0800
• 55bbe63158 Merge branch 'jng' into feat-zjy-issue-008 zhoujunyao 2025-06-15 17:57:33 +0800
• d8ae7edb3b 修改命名 lzh 2025-06-15 16:00:04 +0800
• e9bc29a205 Merge branch 'jng' into dev 桀尼龟 2025-06-15 15:58:57 +0800
• f3eb2eef59 修改 桀尼龟 2025-06-15 15:58:49 +0800
• 4ad9771a3a 解决冲突 桀尼龟 2025-06-15 14:51:25 +0800
• b91131b7cd Merge branch 'dev-lzh' into dev lzh 2025-06-15 14:36:06 +0800
• 21504e78f2 补充金额字段 lzh 2025-06-15 14:35:39 +0800
• 70a3e0a317 Merge branch 'dev-lzh' into dev lzh 2025-06-15 14:25:49 +0800
• e6eb835a01 补充支付时间字段 lzh 2025-06-15 14:24:02 +0800
• 9ef0599430 Merge branch 'dev-lzh' into dev lzh 2025-06-15 13:50:27 +0800
• 74277a50ef 待确认记录查询 lzh 2025-06-15 13:50:20 +0800