Commit Graph

  • b7d792ce07 Merge branch 'feat-cjy-taskBench' into dev dev cjy 2025-10-17 16:54:04 +0800
  • abe34505b3 bugfix: 修复报错 feat-cjy-taskBench cjy 2025-10-17 16:53:42 +0800
  • d858ec0039 Merge branch 'feat-cjy-taskBench' into dev cjy 2025-10-17 16:36:34 +0800
  • 8f0fa39ab9 bugfix: 添加迁移任务余额表和任务日志表 cjy 2025-10-17 16:36:17 +0800
  • ad202d8739 Merge branch 'feat-cjy-taskBench' into dev cjy 2025-10-17 16:16:27 +0800
  • be4f88e943 Merge branch 'dev-lzh-0905' into dev lzh 2025-10-17 16:00:01 +0800
  • 4897fbe098 修改字段类型 dev-lzh-09051 lzh 2025-10-17 15:59:50 +0800
  • d69d6ee2b7 Merge branch 'dev-lzh-09051' into dev lzh 2025-10-17 15:55:43 +0800
  • 15e9ac2086 Merge branch 'dev' into dev-lzh-0905 dev-lzh-0905 lzh 2025-10-17 15:52:27 +0800
  • 790a5290e3 导出字段修改 lzh 2025-10-17 15:52:22 +0800
  • 1ed1085d0f 1 lzh 2025-10-17 15:48:41 +0800
  • 5269d7e24c bugfix: 根据余额表细分的情况,将任务表细分,并添加任务余额表,不依赖套餐余额 cjy 2025-10-17 14:25:41 +0800
  • 3dc530db91 Merge branch 'dev-lzh-0905' into dev lzh 2025-10-17 13:29:58 +0800
  • 4939c916ef 支持默认布局 lzh 2025-10-17 13:29:52 +0800
  • 2dde055ead Merge branch 'dev-lzh-0905' into dev lzh 2025-10-17 10:26:22 +0800
  • 78d1935065 添加表格布局存储 lzh 2025-10-17 10:15:24 +0800
  • 6d0ccb0c9d Merge branch 'main' into feat-cjy-taskBench cjy 2025-10-16 16:45:28 +0800
  • 205564cb00 Merge branch 'dev-lzh-0905' into dev lzh 2025-10-16 16:37:44 +0800
  • 1ba0cce450 excel导出接口 lzh 2025-10-16 16:37:38 +0800
  • 6b12c7441d bugfix:修改关于时间区间的处理 cjy 2025-09-04 19:01:15 +0800
  • b82f4159ba bugfix: 修复查询报错 cjy 2025-09-05 09:34:07 +0800
  • 6e55cfcf89 Merge branch 'dev-lzh-0905' into dev lzh 2025-10-16 09:41:58 +0800
  • 37fa991a9f 修改激活接口 lzh 2025-10-16 09:41:52 +0800
  • 8018d286aa Merge branch 'dev-lzh-0905' into dev lzh 2025-10-16 09:37:58 +0800
  • 8b6b184863 修改激活接口 lzh 2025-10-16 09:37:48 +0800
  • d58f0e574a Merge branch 'dev-lzh-0905' into dev lzh 2025-10-16 09:32:53 +0800
  • c4affb238c 修改激活接口 lzh 2025-10-16 09:32:47 +0800
  • 34f2225568 1 lzh 2025-10-15 15:53:59 +0800
  • 51db761716 Merge branch 'dev-lzh-0905' into dev lzh 2025-10-15 15:52:57 +0800
  • c69a5d8c14 1 lzh 2025-10-15 15:52:53 +0800
  • b01909e7f8 Merge branch 'dev-lzh-0905' into dev lzh 2025-10-15 15:48:06 +0800
  • 8bdc5982df Merge branch 'dev-lzh-1009' into dev-lzh-0905 lzh 2025-10-15 15:46:53 +0800
  • 53bf31865a 拓展时间修改 lzh 2025-10-15 15:01:47 +0800
  • fc7c88c85f 新的套餐扩展 lzh 2025-10-15 14:41:38 +0800
  • 9e4fb0543c 1 lzh 2025-10-14 16:47:13 +0800
  • f4d6345707 套餐使用情况 lzh 2025-10-14 16:44:43 +0800
  • 12301aef82 余量查询接口 lzh 2025-10-13 16:44:55 +0800
  • cae2e19a96 添加每月余量更新 lzh 2025-10-13 14:15:37 +0800
  • d1647bb9cf Merge branch 'feat-hjj-packageManage#A116' into dev jiaji.H 2025-10-13 09:57:36 +0800
  • f1b0c0d388 Updata:更新错误返回信息 feat-hjj-packageManage#A116 jiaji.H 2025-10-13 09:57:23 +0800
  • 7fe3cfe17b Merge branch 'feat-hjj-packageManage#A116' into dev jiaji.H 2025-10-11 16:52:33 +0800
  • d915175416 Updata:修正分页返回数据错误 jiaji.H 2025-10-11 16:52:23 +0800
  • 06bf3e2bc8 Merge branch 'feat-hjj-packageManage#A116' into dev jiaji.H 2025-10-11 13:29:23 +0800
  • 2fd0f940a0 Updata:添加初始额度类型限制逻辑 jiaji.H 2025-10-11 13:29:12 +0800
  • 9a2822298c Merge branch 'feat-hjj-packageManage#A116' into dev jiaji.H 2025-10-11 11:32:38 +0800
  • 62755cc884 Updata:补充套餐更新逻辑 jiaji.H 2025-10-11 11:32:23 +0800
  • 6cded5543f 过滤软删除 main dev-lzh-1009 lzh 2025-10-10 17:11:55 +0800
  • f0dbb9c9be 过滤重复作品 lzh 2025-10-10 17:07:43 +0800
  • ea00e1e361 1 lzh 2025-10-10 17:03:05 +0800
  • 76390c3f66 使用记录查询条件 lzh 2025-10-10 16:39:19 +0800
  • 3324129ed2 更新 lzh 2025-10-10 16:30:17 +0800
  • c9663f2bfe Merge branch 'dev-lzh-1009' into dev lzh 2025-10-10 14:15:55 +0800
  • 6c5ae80059 添加使用类型过滤 lzh 2025-10-10 14:14:13 +0800
  • 2756006a7f Merge branch 'dev-lzh-1009' into dev lzh 2025-10-10 10:31:42 +0800
  • 24e1eaed14 新增使用类型字段 lzh 2025-10-10 10:24:20 +0800
  • 7ea566bd9b Merge branch 'dev-lzh-1009' into dev lzh 2025-10-09 17:59:39 +0800
  • 422d2acb5a 添加使用类型字段 lzh 2025-10-09 17:09:43 +0800
  • bcc418a55f 1 lzh 2025-10-09 17:03:55 +0800
  • 6907e59e2e 首次激活重新计算余量时长 lzh 2025-09-28 16:30:20 +0800
  • 84e78bc808 1 lzh 2025-09-28 14:27:02 +0800
  • 5edac38772 更新proto lzh 2025-09-28 14:18:11 +0800
  • bbd69e32b3 Merge branch 'jng' into dev-lzh-0905 lzh 2025-09-24 15:03:03 +0800
  • ce243c39b8 修改新的余量表 lzh 2025-09-24 15:00:51 +0800
  • b80ce9ec70 Merge branch 'dev-lzh-0905' into dev lzh 2025-09-24 11:40:57 +0800
  • 8b35ba97c8 使用秒级时间戳 lzh 2025-09-24 11:40:45 +0800
  • 01fa323c4d Merge branch 'dev-lzh-0905' into dev lzh 2025-09-24 11:35:04 +0800
  • cf07e0d29b 时间过滤条件修改 lzh 2025-09-24 11:34:57 +0800
  • 5b9bfc11b1 Merge branch 'dev-lzh-0905' into dev lzh 2025-09-24 11:23:07 +0800
  • 1112d253ee 格式化提交时间 lzh 2025-09-24 11:22:39 +0800
  • 640eb0d58c 1 lzh 2025-09-23 14:23:56 +0800
  • 8590d6cd9c Merge branch 'dev-lzh-0905' into dev lzh 2025-09-23 14:23:37 +0800
  • 9b37dab44f 添加确认时间字段 lzh 2025-09-23 14:23:24 +0800
  • 5d46b21645 Merge branch 'dev-lzh-0905' into dev lzh 2025-09-23 14:19:20 +0800
  • ec1e99ec42 添加作品提交时间 lzh 2025-09-23 14:17:32 +0800
  • 76e4b7c998 Merge branch 'feat-hjj-packageManage#A116' into dev jiaji.H 2025-09-19 10:57:12 +0800
  • 91fa9afa58 Updata:添加套餐数量符号检验 jiaji.H 2025-09-19 10:54:03 +0800
  • cf427ec269 Updata:解决冲突 jng jiaji.H 2025-09-17 11:20:49 +0800
  • 5f4e1610d3 Updata:增加注释 jiaji.H 2025-09-17 11:20:01 +0800
  • 5fd972942b Updata:订单添加增值服务信息 jiaji.H 2025-09-17 11:16:22 +0800
  • 95a6219fd7 Updata:解决冲突 jiaji.H 2025-09-16 13:47:01 +0800
  • 2fc46f8bb7 Updata:优化套餐查询逻辑效率 jiaji.H 2025-09-16 13:45:16 +0800
  • 1b9a64068a Upfata:新增套餐字段添加 jiaji.H 2025-09-16 13:25:32 +0800
  • ec5abc5fe4 解决冲突 JNG 2025-09-15 19:07:25 +0800
  • 897f375130 11 JNG 2025-09-15 19:07:00 +0800
  • 6e2bff33da Updata:解决冲突 jiaji.H 2025-09-15 15:08:50 +0800
  • 7edef20a45 feat:返回值中添加服务默认数量 jiaji.H 2025-09-15 14:55:54 +0800
  • 75de934c4f feat:新增加服务添加是否默认选项 jiaji.H 2025-09-15 14:33:26 +0800
  • 7c08286128 feat:添加套餐权益与附加套餐权益合理性验证 jiaji.H 2025-09-15 13:53:32 +0800
  • 4e066d88d5 Merge branch 'feat-hjj-packageManage#A116' into dev jiaji.H 2025-09-12 13:20:46 +0800
  • e406bcc63a Updata:更新套餐类型检索逻辑 jiaji.H 2025-09-12 13:20:35 +0800
  • 0595617645 Merge branch 'feat-hjj-packageManage#A116' into dev jiaji.H 2025-09-12 10:45:02 +0800
  • 51f1c674fa Updata:调整接口名称 jiaji.H 2025-09-12 10:44:49 +0800
  • 9830f38ffb Merge branch 'feat-hjj-packageManage#A116' into dev jiaji.H 2025-09-12 10:38:21 +0800
  • 66c2669557 feat:调整套餐差异更新逻辑 jiaji.H 2025-09-12 10:37:25 +0800
  • bca70c5493 Updata:解决冲突 jiaji.H 2025-09-11 15:32:15 +0800
  • 479cb7255f Merge branch 'feat-sxy-0911' into dev sxy 2025-09-11 15:13:12 +0800
  • 61b7fedf0d 修改 feat-sxy-0911 sxy 2025-09-11 15:12:13 +0800
  • 17b557df77 修改条件 sxy 2025-09-11 15:10:26 +0800
  • 9635ec4572 Updata:区分套餐权益和附加权益 jiaji.H 2025-09-11 14:54:21 +0800
  • 0dcbb3a057 解决冲突 JNG 2025-09-11 14:54:12 +0800