Commit Graph

  • 9580d22a76 Merge branch 'dev-lzh-0905' into dev dev lzh 2025-10-24 17:02:17 +0800
  • b9205eecf7 补全导出查询字段 dev-lzh-09051 lzh 2025-10-24 17:02:10 +0800
  • 0c61b17eeb 补全导出查询字段 lzh 2025-10-24 17:01:49 +0800
  • 533df366d4 Merge branch 'dev-lzh-0905' into dev lzh 2025-10-24 16:39:09 +0800
  • ea70744f36 单价保留两位小数 lzh 2025-10-24 16:39:02 +0800
  • 9d2ccbd0c1 Merge branch 'dev-lzh-0905' into dev lzh 2025-10-24 15:03:54 +0800
  • 89a802a8bf 余量导出添加参数 lzh 2025-10-24 15:01:56 +0800
  • 03d68ad339 Merge branch 'feat-cjy-taskBench' into dev cjy 2025-10-24 14:57:36 +0800
  • 458f76e2f8 bugfix: 修复最近查询记录失败和操作人手机号查询 feat-cjy-taskBench cjy 2025-10-24 14:57:01 +0800
  • d980edc2d5 Merge branch 'dev-lzh-0905' into dev lzh 2025-10-24 11:54:06 +0800
  • 3461c75c04 余量统计问题修复 lzh 2025-10-24 11:53:45 +0800
  • 089999abbd Merge branch 'feat-cjy-taskBench' into dev cjy 2025-10-24 11:53:18 +0800
  • 1de6ac345b bugfix: 套餐余额新增字段,任务余额同步修改 cjy 2025-10-24 11:53:05 +0800
  • 0ed6481c77 Merge branch 'dev-lzh-0905' into dev lzh 2025-10-24 10:44:35 +0800
  • 69fabda65f 非过期数据叠加 lzh 2025-10-24 10:44:25 +0800
  • f2192dadc0 Merge branch 'dev-lzh-0905' into dev lzh 2025-10-24 10:20:12 +0800
  • 7123333344 优化增加余量字段 lzh 2025-10-24 10:20:04 +0800
  • 670a2b68d9 Merge branch 'feat-cjy-taskBench' into dev cjy 2025-10-23 15:39:20 +0800
  • 3f9b89ddac bugfix: 修改查询进行中和已完成任务数量的方式 cjy 2025-10-23 15:39:08 +0800
  • 23419fd40c Merge branch 'feat-cjy-taskBench' into dev cjy 2025-10-23 14:53:36 +0800
  • be78b69db4 bugfix: 更新待发任务时,同时修改最后一次指派人和进行中的任务数量和已完成任务数量。 cjy 2025-10-23 14:53:15 +0800
  • 5891719749 余量每月更新任务 lzh 2025-10-23 14:11:19 +0800
  • 2dbfe94c14 Merge branch 'feat-cjy-taskBench' into dev cjy 2025-10-23 11:51:35 +0800
  • 5cdcf7376d bugfix: 在没有任务 uuid 的情况下,如果找不到任务记录不报错,影响流程 cjy 2025-10-23 11:51:17 +0800
  • 1838187a64 Merge branch 'feat-cjy-taskBench' into dev cjy 2025-10-23 10:57:30 +0800
  • edef65a3e1 bugfix: 修复待完成任务数量校验,避免负数。 cjy 2025-10-23 10:57:15 +0800
  • aea3db29bc Merge branch 'feat-cjy-taskBench' into dev cjy 2025-10-22 19:40:43 +0800
  • 441f2e4fc0 bugfix: 把手动扩展任务数量也计算如到增值任务余额。修改扣减任务数量的顺序 cjy 2025-10-22 19:40:09 +0800
  • 3c9d5fedc8 Merge branch 'jng' into dev JNG 2025-10-22 18:49:26 +0800
  • af0e581c00 Update conf.ini jng JNG 2025-10-22 18:49:16 +0800
  • 29a1c61fa5 Merge branch 'feat-cjy-taskBench' into dev cjy 2025-10-22 18:39:04 +0800
  • 952e6e930c bugfix: 修复查询指派操作人查询错误 cjy 2025-10-22 18:38:50 +0800
  • cc63ba31a0 Merge branch 'feat-cjy-taskBench' into dev cjy 2025-10-22 18:13:03 +0800
  • ada27d67ba bugfix: 修复指派时,没有指定指派的数量。修复完成任务时,更新待发任务数量 cjy 2025-10-22 18:12:46 +0800
  • dc7fdc3300 Merge branch 'dev-lzh-0905' into dev lzh 2025-10-22 16:13:44 +0800
  • ab0bf36953 修改使用记录类型 lzh 2025-10-22 16:13:36 +0800
  • 4ef0cdd7c9 Merge branch 'feat-cjy-taskBench' into dev cjy 2025-10-22 16:04:20 +0800
  • a671df3c25 bugfix : 修改报错提示语 cjy 2025-10-22 16:04:05 +0800
  • a88cc56f24 Merge branch 'feat-cjy-taskBench' into dev cjy 2025-10-22 15:54:15 +0800
  • 6decfdca6f bugfix: 套餐过期后,不能完成过期艺人的任务 cjy 2025-10-22 15:54:03 +0800
  • 4687a172f2 Merge branch 'dev-lzh-0905' into dev lzh 2025-10-22 15:23:06 +0800
  • cc6f1577a1 手动扩展类型算作增值类型 lzh 2025-10-22 15:22:54 +0800
  • 40badd2edf Merge branch 'feat-cjy-taskBench' into dev cjy 2025-10-22 15:20:51 +0800
  • 3930d1fb5b bugfix: 如果是查询已完成,就按照完成时间降序返回 cjy 2025-10-22 15:20:30 +0800
  • cbdeedc1c5 Merge branch 'dev-lzh-0905' into dev lzh 2025-10-22 14:34:31 +0800
  • 66ee049376 固定初始字段顺序 lzh 2025-10-22 14:34:22 +0800
  • 509ebb61a6 Merge branch 'feat-cjy-taskBench' into dev cjy 2025-10-22 14:08:09 +0800
  • 9ffca3094b bugfix: 修改指派扣减逻辑 cjy 2025-10-22 14:07:49 +0800
  • 483314d2c4 Merge branch 'feat-cjy-taskBench' into dev cjy 2025-10-22 13:06:10 +0800
  • 3638845d6e bugfix: 完成数量超过限制不报错 cjy 2025-10-22 13:05:50 +0800
  • 947651ea3f Merge branch 'feat-cjy-taskBench' into dev cjy 2025-10-22 12:46:45 +0800
  • 0e284a8d6f bugfix: 修复查询待发数量、修复初次启动时数据同步的问题 cjy 2025-10-22 12:45:54 +0800
  • 2b60f44b85 Merge branch 'feat-cjy-taskBench' into dev cjy 2025-10-22 10:24:06 +0800
  • 854cb61551 bugfix: 修复初次同步 cjy 2025-10-22 10:23:44 +0800
  • 58e429ad0c Merge branch 'dev-lzh-0905' into dev lzh 2025-10-22 10:17:39 +0800
  • 16cb0245cf 修复时间类型扩展 lzh 2025-10-22 10:17:28 +0800
  • 7fe2038dcb Reapply "feat: 购买套餐和扩展套餐余额时同步任务余额" feat-cjy-taskBanch-dev cjy 2025-10-22 10:07:37 +0800
  • aa7de9e4f6 Revert "feat: 购买套餐和扩展套餐余额时同步任务余额" cjy 2025-10-22 09:08:19 +0800
  • 48039127e1 feat: 购买套餐和扩展套餐余额时同步任务余额 cjy 2025-10-22 08:56:50 +0800
  • b6d7271420 Merge branch 'feat-cjy-taskBench' into dev cjy 2025-10-21 20:29:28 +0800
  • 7748878608 bugfix: 实现和余额表同步以及把修改待发数据的接口与申诉合并 cjy 2025-10-21 20:09:01 +0800
  • 387df055ee Merge branch 'feat-cjy-taskBench' into dev cjy 2025-10-21 17:50:25 +0800
  • 142bf642dd bugfix:去掉任务管理表中任务字段 cjy 2025-10-21 17:50:04 +0800
  • a1ccdeb58b 过滤软删除类型 lzh 2025-10-21 17:20:32 +0800
  • 18ba745611 Merge branch 'dev-lzh-0905' into dev lzh 2025-10-21 17:08:17 +0800
  • 404ddc9cf8 扩展时间修改 lzh 2025-10-21 17:08:03 +0800
  • c67ea8668b Merge branch 'dev-lzh-0905' into dev lzh 2025-10-21 17:03:34 +0800
  • f774a5ad06 修改手动扩展 lzh 2025-10-21 17:03:28 +0800
  • 9d5cc117b9 Merge branch 'dev-lzh-0905' into dev lzh 2025-10-21 16:40:00 +0800
  • ef1a9ab5de 使用余量修改 lzh 2025-10-21 16:39:51 +0800
  • a47421f758 Merge branch 'dev-lzh-0905' into dev lzh 2025-10-21 15:43:55 +0800
  • 60d56109fe 余量查询最新月份 lzh 2025-10-21 15:43:43 +0800
  • 60f4775cbc 过滤删除的条目 lzh 2025-10-21 14:50:56 +0800
  • 71f9b24935 Merge branch 'dev-lzh-0905' into dev lzh 2025-10-21 14:21:14 +0800
  • 61441bd201 bug修复 lzh 2025-10-21 14:21:04 +0800
  • 4359e001ea Merge branch 'dev-lzh-0905' into dev lzh 2025-10-21 13:40:55 +0800
  • 8381244d86 余量计算修改 lzh 2025-10-21 13:40:47 +0800
  • a8ffa7b798 Merge branch 'dev-lzh-0905' into dev lzh 2025-10-21 13:30:20 +0800
  • 49a96cbadc 1 lzh 2025-10-21 13:30:14 +0800
  • 78e41e8a1c Merge branch 'dev-lzh-0905' into dev lzh 2025-10-21 11:33:42 +0800
  • 17d4581092 修改扩展接口 lzh 2025-10-21 11:33:31 +0800
  • 39d899288a Merge branch 'dev-lzh-0905' into dev lzh 2025-10-21 10:47:16 +0800
  • f5b64a3d86 解决NAN错误 lzh 2025-10-21 10:47:08 +0800
  • 8700778baa Merge branch 'dev-lzh-0905' into dev lzh 2025-10-21 10:19:58 +0800
  • 7c30bac725 余量信息修订 lzh 2025-10-21 10:19:48 +0800
  • 54b5668049 Merge branch 'dev-lzh-0905' into dev lzh 2025-10-21 10:02:30 +0800
  • 23e3d3371f 扩展修订 lzh 2025-10-21 09:59:55 +0800
  • ed629f515f 过滤被删除的订单 lzh 2025-10-21 09:38:42 +0800
  • 6cfbf9e079 Merge branch 'dev-lzh-0905' into dev lzh 2025-10-20 17:02:08 +0800
  • 36ef189971 补充余量信息字段 lzh 2025-10-20 16:59:40 +0800
  • 5ec0375d2a 补充余量信息字段 lzh 2025-10-20 16:56:59 +0800
  • fb085348dc 解决冲突 JNG 2025-10-20 15:20:26 +0800
  • af4ad3339f 订单详情添加类型 JNG 2025-10-20 15:19:59 +0800
  • f8c5105580 修改余量创建 lzh 2025-10-20 14:21:31 +0800
  • 426334fa3d Merge branch 'feat-cjy-taskBench' into dev cjy 2025-10-20 11:52:50 +0800
  • 3e1739d5c0 bugfix: 添加进行中的任务和已完成任务数量排序。修改报错提示 cjy 2025-10-20 11:52:28 +0800
  • 99bcece551 Merge branch 'feat-cjy-taskBench' into dev cjy 2025-10-20 10:16:22 +0800
  • c67a84cca7 bugfix: 移除重复索引 cjy 2025-10-20 10:16:11 +0800
  • b7d792ce07 Merge branch 'feat-cjy-taskBench' into dev cjy 2025-10-17 16:54:04 +0800
  • abe34505b3 bugfix: 修复报错 cjy 2025-10-17 16:53:42 +0800