Commit Graph

Select branches

Hide Pull Requests

dev

dev-lzh

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

• 24102eccbd 11 main jng 桀尼龟 2025-07-08 16:16:04 +0800
• dad01f7f85 解决冲突 dev 桀尼龟 2025-07-08 16:12:50 +0800
• 383a64077d 添加手续费 桀尼龟 2025-07-08 16:12:16 +0800
• 68dd832b32 fix: 处理pb冲突 zhoujunyao 2025-07-08 15:21:20 +0800
• 346dcb1d94 Merge branch 'feat-zjy-issue-013' into main zhoujunyao 2025-07-08 15:20:34 +0800
• 170793fbd7 Merge branch 'feat-zjy-issue-013' into dev 桀尼龟 2025-07-08 15:10:57 +0800
• de204751ac 修改 feat-zjy-issue-013 桀尼龟 2025-07-08 15:10:45 +0800
• 2e845b4fe1 修改 桀尼龟 2025-07-08 15:10:26 +0800
• b2732eeaf9 解决冲突 桀尼龟 2025-07-08 14:18:05 +0800
• 744328055c 添加手续费 桀尼龟 2025-07-08 14:17:38 +0800
• 1dada43e0c 解决冲突 桀尼龟 2025-07-07 19:34:57 +0800
• 234d86896a 添加excel导入 桀尼龟 2025-07-07 19:27:51 +0800
• 402a7644e6 fix: 提交支持自动创建用户和订单代码 zhoujunyao 2025-07-07 13:31:17 +0800
• 841ec173c4 Merge branch 'dev-lzh' lzh 2025-07-07 11:58:32 +0800
• 776574c4e0 Merge branch 'dev-lzh' into dev lzh 2025-07-07 10:46:51 +0800
• 87b7805c42 添加扩展记录的时间单位 dev-lzh lzh 2025-07-07 10:46:13 +0800
• d5e4c9590f Merge branch 'jng' 桀尼龟 2025-07-03 16:11:44 +0800
• bda31412ee Merge branch 'jng' into dev 桀尼龟 2025-07-03 14:31:35 +0800
• e9f12cd0eb 111 桀尼龟 2025-07-03 14:28:09 +0800
• e7a5e19472 添加手续费字段 桀尼龟 2025-07-03 14:02:25 +0800
• 76e2b893a1 解决冲突 桀尼龟 2025-07-02 15:30:51 +0800
• 641c10aec2 解决冲突 桀尼龟 2025-07-02 14:01:44 +0800
• 0f40072e22 添加支付时间筛选 桀尼龟 2025-07-02 14:00:54 +0800
• 57a3154634 fix: 拦截重复回调 feat-zjy-fixbug zhoujunyao 2025-06-27 20:03:21 +0800
• 40b3d8ddde Merge branch 'dev-lzh' into dev lzh 2025-06-27 17:57:24 +0800
• a556777369 优化待确认作品查询逻辑，拆分状态条件子查询 lzh 2025-06-27 17:42:10 +0800
• 37c525d5c2 "优化用户余额查询SQL，增加过期时间倒序排序；修正发布平台ID字段命名大小写不一致问题" lzh 2025-06-27 16:10:39 +0800
• 4ec5bb8915 "修正字段命名大小写不一致问题" lzh 2025-06-27 15:29:53 +0800
• 335a61d6e7 "添加过期时间降序排序并优化查询字段" lzh 2025-06-27 14:44:42 +0800
• b06d06c8e2 添加用户ID分组查询条件 lzh 2025-06-27 14:37:28 +0800
• 1f1fbed3a8 "修改数据库表名从 fiee_bundle 到 micro_bundle" lzh 2025-06-27 11:32:17 +0800
• 9c3c441eda 修改冲突&&合并代码 sxy 2025-06-26 17:34:03 +0800
• 8fe858aa03 Merge branch 'main' of https://gitea-inner.fontree.cn/fiee/micro-bundle sxy 2025-06-26 17:33:08 +0800
• f3e29cb7e8 解决冲突 桀尼龟 2025-06-26 17:32:53 +0800
• ae4bbe29c0 Merge branch 'sxy' sxy 2025-06-26 17:31:25 +0800
• bfc409ed70 Merge branch 'dev-lzh' lzh 2025-06-26 17:18:58 +0800
• ea4d3cacd4 Merge branch 'sxy' into dev sxy 2025-06-26 17:10:45 +0800
• a01be125e6 修改冲突 sxy sxy 2025-06-26 17:10:29 +0800
• 46ffdc0d0d Merge branch 'jng' into dev 桀尼龟 2025-06-26 13:53:41 +0800
• 7c0027f624 修改 桀尼龟 2025-06-26 13:53:16 +0800
• c25157b661 Merge branch 'jng' into dev 桀尼龟 2025-06-26 13:41:07 +0800
• 397dd56761 修改 桀尼龟 2025-06-26 13:40:03 +0800
• f436794256 Merge branch 'dev-lzh' into dev lzh 2025-06-26 09:19:30 +0800
• 0a4218757e ` lzh 2025-06-26 09:19:23 +0800
• 150e7162fe 优化待确认作品查询SQL，调整状态过滤条件位置 lzh 2025-06-26 09:18:51 +0800
• 24a6fd1eba Merge branch 'jng' into dev 桀尼龟 2025-06-25 16:58:31 +0800
• 26eb0df464 修改 桀尼龟 2025-06-25 16:57:57 +0800
• 66f70eb643 修改 桀尼龟 2025-06-25 15:31:42 +0800
• b9313b9ba2 添加状态筛选 桀尼龟 2025-06-25 15:29:37 +0800
• f2785fd407 Merge branch 'dev-lzh' into dev lzh 2025-06-25 15:23:18 +0800
• 4f9b72928b "修正发布平台ID字段命名大小写不一致问题" lzh 2025-06-25 15:21:53 +0800
• 953641b575 Merge branch 'dev-lzh' into dev lzh 2025-06-25 13:49:03 +0800
• 7468c2f442 "修正用户余额查询SQL中的字段别名拼写错误" lzh 2025-06-25 13:48:54 +0800
• 047451e5c4 Merge branch 'sxy' into dev sxy 2025-06-25 13:37:43 +0800
• 9c9e9c0663 修改返回数据校验 sxy 2025-06-25 13:36:33 +0800
• f4841ed772 Merge branch 'dev-lzh' into dev lzh 2025-06-25 11:56:20 +0800
• e4a9c3ac4d 优化套餐余额查询SQL，调整JOIN逻辑并简化查询条件 lzh 2025-06-25 11:56:09 +0800
• 63516ad0a8 Merge branch 'dev-lzh' into dev lzh 2025-06-25 10:14:06 +0800
• 92c8e4d574 优化套餐余额更新方式，直接使用旧数据模型并改用Save方法 lzh 2025-06-25 10:13:57 +0800
• 93dac4ec2e Merge branch 'dev-lzh' into dev lzh 2025-06-25 09:33:37 +0800
• 1b5b6037fd 增加待确认作品状态过滤条件 lzh 2025-06-25 09:33:29 +0800
• 5a3367e47d Merge branch 'dev-lzh' into dev lzh 2025-06-24 17:08:47 +0800
• 1885d2b8dc "优化用户余额查询的JOIN方式并添加分组" lzh 2025-06-24 17:08:36 +0800
• 7154d0a92a Merge branch 'dev-lzh' into dev lzh 2025-06-24 16:29:20 +0800
• f55af5f719 过滤待确认条件 lzh 2025-06-24 16:29:11 +0800
• cd4e1492c8 Merge branch 'sxy' into dev sxy 2025-06-24 16:01:05 +0800
• 668b7eb06e 修改信息-服务类型 sxy 2025-06-24 16:00:45 +0800
• 6e29d40998 Merge branch 'sxy' into dev sxy 2025-06-24 15:54:25 +0800
• 56c17a709f 修改信息 sxy 2025-06-24 15:53:10 +0800
• d6888a4e3c Merge branch 'dev-lzh' into dev lzh 2025-06-24 15:14:18 +0800
• 043274e61f 添加余量信息已购买字段 lzh 2025-06-24 15:08:37 +0800
• 38fccfa827 Merge branch 'dev-lzh' into dev lzh 2025-06-24 15:04:16 +0800
• 0167e40f9e 过滤重复的作品id lzh 2025-06-24 15:04:09 +0800
• e46e5a3635 Merge branch 'sxy' into dev sxy 2025-06-24 14:25:06 +0800
• eca1a2329e 增加语言表获取接口 sxy 2025-06-24 14:24:38 +0800
• 3c1984be81 增加语言表获取接口 sxy 2025-06-24 14:22:31 +0800
• e8f76dd102 Merge branch 'dev-lzh' into dev lzh 2025-06-24 14:03:55 +0800
• 46a6c5723f 过滤被删除的用户 lzh 2025-06-24 14:03:35 +0800
• 58a066315b 解决冲突 桀尼龟 2025-06-24 13:42:22 +0800
• f02601e5e8 修改 桀尼龟 2025-06-24 13:41:10 +0800
• 93ccab7d42 Merge branch 'dev-lzh' into dev lzh 2025-06-24 13:38:22 +0800
• bfa9fc4026 订单记录取最新 lzh 2025-06-24 13:38:16 +0800
• 621f6c906d Merge branch 'dev-lzh' into dev lzh 2025-06-24 12:00:17 +0800
• fb3b33a817 显示过期的套餐信息 lzh 2025-06-24 12:00:09 +0800
• 360ea2b4d5 Merge branch 'dev-lzh' into dev lzh 2025-06-24 11:27:58 +0800
• 70c4eacce4 1 lzh 2025-06-24 11:27:50 +0800
• a45369d1b5 Merge branch 'sxy' into dev sxy 2025-06-23 16:25:17 +0800
• 52d9baf2e6 修改上下架校验 sxy 2025-06-23 16:25:03 +0800
• cba59941cb Merge branch 'sxy' into dev sxy 2025-06-23 15:24:05 +0800
• ed0f0c9584 修改套餐逻辑 sxy 2025-06-23 15:23:49 +0800
• 06da79539e Merge branch 'dev-lzh' into dev lzh 2025-06-23 14:26:43 +0800
• f82a96907c 1 lzh 2025-06-23 14:24:12 +0800
• 3506b1fdc7 Merge branch 'dev-lzh' into dev lzh 2025-06-23 14:11:32 +0800
• 24c701d9a1 修改使用记录的用户名搜索 lzh 2025-06-23 14:11:07 +0800
• 99ba1fc52d Merge branch 'dev-lzh' into dev lzh 2025-06-23 13:55:34 +0800
• 37bae4398d 修改使用记录排序 lzh 2025-06-23 13:55:29 +0800
• 107a457111 Merge branch 'dev-lzh' into dev lzh 2025-06-23 10:37:11 +0800
• d3b82f4352 余量列表支持电话号码搜索 lzh 2025-06-23 10:37:04 +0800
• edc93077a7 Merge branch 'dev-lzh' into dev lzh 2025-06-20 16:57:07 +0800
• 75a75e9480 时区错误修改 lzh 2025-06-20 16:57:01 +0800