Commit Graph

367 Commits

Author SHA1 Message Date
dad01f7f85 解决冲突 2025-07-08 16:12:50 +08:00
383a64077d 添加手续费 2025-07-08 16:12:16 +08:00
2e845b4fe1 修改 2025-07-08 15:10:26 +08:00
b2732eeaf9 解决冲突 2025-07-08 14:18:05 +08:00
744328055c 添加手续费 2025-07-08 14:17:38 +08:00
1dada43e0c 解决冲突 2025-07-07 19:34:57 +08:00
234d86896a 添加excel导入 2025-07-07 19:27:51 +08:00
402a7644e6 fix: 提交支持自动创建用户和订单代码 2025-07-07 13:31:17 +08:00
lzh
776574c4e0 Merge branch 'dev-lzh' into dev 2025-07-07 10:46:51 +08:00
lzh
87b7805c42 添加扩展记录的时间单位 2025-07-07 10:46:13 +08:00
d5e4c9590f Merge branch 'jng' 2025-07-03 16:11:44 +08:00
bda31412ee Merge branch 'jng' into dev 2025-07-03 14:31:35 +08:00
e9f12cd0eb 111 2025-07-03 14:28:09 +08:00
e7a5e19472 添加手续费字段 2025-07-03 14:02:25 +08:00
76e2b893a1 解决冲突 2025-07-02 15:30:51 +08:00
641c10aec2 解决冲突 2025-07-02 14:01:44 +08:00
0f40072e22 添加支付时间筛选 2025-07-02 14:00:54 +08:00
57a3154634 fix: 拦截重复回调 2025-06-27 20:03:21 +08:00
lzh
40b3d8ddde Merge branch 'dev-lzh' into dev 2025-06-27 17:57:24 +08:00
lzh
a556777369 优化待确认作品查询逻辑,拆分状态条件子查询 2025-06-27 17:42:10 +08:00
lzh
37c525d5c2 "优化用户余额查询SQL,增加过期时间倒序排序;修正发布平台ID字段命名大小写不一致问题" 2025-06-27 16:10:39 +08:00
lzh
4ec5bb8915 "修正字段命名大小写不一致问题" 2025-06-27 15:29:53 +08:00
lzh
335a61d6e7 "添加过期时间降序排序并优化查询字段" 2025-06-27 14:44:42 +08:00
lzh
b06d06c8e2 添加用户ID分组查询条件 2025-06-27 14:37:28 +08:00
lzh
1f1fbed3a8 "修改数据库表名从 fiee_bundle 到 micro_bundle" 2025-06-27 11:32:17 +08:00
sxy
8fe858aa03 Merge branch 'main' of https://gitea-inner.fontree.cn/fiee/micro-bundle 2025-06-26 17:33:08 +08:00
f3e29cb7e8 解决冲突 2025-06-26 17:32:53 +08:00
sxy
ae4bbe29c0 Merge branch 'sxy' 2025-06-26 17:31:25 +08:00
lzh
bfc409ed70 Merge branch 'dev-lzh' 2025-06-26 17:18:58 +08:00
sxy
ea4d3cacd4 Merge branch 'sxy' into dev 2025-06-26 17:10:45 +08:00
sxy
a01be125e6 修改冲突 2025-06-26 17:10:29 +08:00
46ffdc0d0d Merge branch 'jng' into dev 2025-06-26 13:53:41 +08:00
7c0027f624 修改 2025-06-26 13:53:16 +08:00
c25157b661 Merge branch 'jng' into dev 2025-06-26 13:41:07 +08:00
397dd56761 修改 2025-06-26 13:40:03 +08:00
lzh
0a4218757e ` 2025-06-26 09:19:23 +08:00
lzh
150e7162fe 优化待确认作品查询SQL,调整状态过滤条件位置 2025-06-26 09:18:51 +08:00
24a6fd1eba Merge branch 'jng' into dev 2025-06-25 16:58:31 +08:00
26eb0df464 修改 2025-06-25 16:57:57 +08:00
66f70eb643 修改 2025-06-25 15:31:42 +08:00
b9313b9ba2 添加状态筛选 2025-06-25 15:29:37 +08:00
lzh
f2785fd407 Merge branch 'dev-lzh' into dev 2025-06-25 15:23:18 +08:00
lzh
4f9b72928b "修正发布平台ID字段命名大小写不一致问题" 2025-06-25 15:21:53 +08:00
lzh
953641b575 Merge branch 'dev-lzh' into dev 2025-06-25 13:49:03 +08:00
lzh
7468c2f442 "修正用户余额查询SQL中的字段别名拼写错误" 2025-06-25 13:48:54 +08:00
sxy
047451e5c4 Merge branch 'sxy' into dev 2025-06-25 13:37:43 +08:00
sxy
9c9e9c0663 修改返回数据校验 2025-06-25 13:36:33 +08:00
lzh
f4841ed772 Merge branch 'dev-lzh' into dev 2025-06-25 11:56:20 +08:00
lzh
e4a9c3ac4d 优化套餐余额查询SQL,调整JOIN逻辑并简化查询条件 2025-06-25 11:56:09 +08:00
lzh
63516ad0a8 Merge branch 'dev-lzh' into dev 2025-06-25 10:14:06 +08:00