Commit Graph

984 Commits

Author SHA1 Message Date
yystopf 4eb7d275a0 Merge branch 'pre_trustie_server' into trustie_server 2025-06-06 16:26:07 +08:00
yystopf 89dd43e079 Merge branch 'standalone_develop' into pre_trustie_server 2025-06-06 16:24:48 +08:00
yystopf 257f295f2c Merge branch 'hh_portrait' into standalone_develop 2025-05-30 11:45:00 +08:00
yystopf eb1b917d98 更改:团队影响度团队人数 2025-05-29 20:22:47 +08:00
yystopf c57482042d 修复:筛选时间不在范围内 2025-05-27 16:57:36 +08:00
yystopf a9668c9651 新增:项目画像数据接口完成 2025-05-27 15:46:12 +08:00
yystopf bff009d673 修复:无法通过企业标识筛选周报 2025-05-27 11:35:39 +08:00
yystopf a5cf0ce14e 修复:issue_type为nil 2025-05-27 11:22:56 +08:00
yystopf 63ff4306d4 修复:创建父周报时合并issue_type 2025-05-26 15:40:28 +08:00
yystopf afc87f1393 更改:个人周报新增分页以及项目组周报创建和个人周报创建一致 2025-05-26 09:08:29 +08:00
yystopf d91b7da82c 新增:项目组本周工作项接口 2025-05-23 10:20:16 +08:00
xxq250 def1f4adf2 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop
# Conflicts:
#	app/services/api/v1/issues/update_service.rb
2025-05-22 15:33:13 +08:00
xxq250 298aec5886 fixed issue关闭时,到期结束时间更新 2025-05-22 15:32:38 +08:00
yystopf bf3540c250 新增:创建周报父周报存储企业标识 2025-05-22 13:59:39 +08:00
yystopf 6574ee5270 新增:issue列表查询企业标识以及移除pm_project_id验证 2025-05-22 13:52:03 +08:00
yystopf 3fe528359e 修复:自动设置结束日期的bug 2025-05-22 10:50:49 +08:00
xxq250 330ab008a8 fixed memos表判断是否存在 2025-05-21 09:54:58 +08:00
xxq250 870eacaced fixed issue增加企业标识 2025-05-21 09:33:00 +08:00
xxq250 70089d06cc fixed 删除user外部方法不能放在事务中 2025-05-19 20:28:09 +08:00
xxq250 6ca55f0f61 fixed issue状态已解决增加信息记录 bug 2025-05-15 18:13:29 +08:00
xxq250 79863995d6 fixed issue状态已解决增加信息记录 2025-05-15 14:06:22 +08:00
xxq250 6c73c6f485 Merge branch 'standalone_develop' into trustie_server 2025-04-01 11:51:53 +08:00
xxq250 076d92a3eb fixed 密码处理,兼容base64 2025-03-31 20:47:23 +08:00
xxq250 efb4b3040d fixed 工作项加到项目时project_issues_index重排序号 2025-03-25 16:17:58 +08:00
xxq250 7fdf4e7557 fixed 工作项加到项目时project_issues_index重排序号 2025-03-25 15:51:47 +08:00
xxq250 272639f9fd Merge branch 'pre_trustie_server' into trustie_server 2025-03-25 15:41:53 +08:00
xxq250 fe77a97057 Merge branch 'standalone_develop' into pre_trustie_server 2025-03-25 15:41:24 +08:00
xxq250 cd32a3ab6c fixed 工作项加到项目时project_issues_index重排序号 2025-03-25 15:40:44 +08:00
xxq250 e17021b9c1 Merge branch 'standalone_develop' into pre_trustie_server 2025-03-13 14:07:15 +08:00
xxq250 c7f7f255d2 fixed issue关闭时,到期结束时间更新 2025-03-03 10:56:11 +08:00
xxq250 21a78563a0 fixed issue关闭时,到期结束时间更新 2025-03-03 10:51:53 +08:00
yystopf 9e10625b8b Merge branch 'pre_trustie_server' into trustie_server 2025-02-14 16:35:37 +08:00
yystopf 383019b7f5 Merge branch 'standalone_develop' into pre_trustie_server 2025-02-14 16:35:09 +08:00
yystopf ef18ea8cdc 更改: 转移项目精选项目清除 2025-02-13 14:00:00 +08:00
xxq250 54c38fd9e7 Merge pull request 'nps增加明细更新' (#330) from pre_trustie_server into trustie_server 2025-01-23 10:55:50 +08:00
xxq250 26621340f1 Merge pull request 'nps增加明细更新' (#329) from standalone_develop into pre_trustie_server 2025-01-23 10:55:12 +08:00
yystopf b27dc8393d 修复: 用户排行榜统计负数处理 2025-01-10 14:55:35 +08:00
yystopf 12061f4ce8 Merge branch 'pre_trustie_server' into trustie_server 2024-11-22 15:38:30 +08:00
yystopf f94d224afc Merge branch 'standalone_develop' into pre_trustie_server 2024-11-22 15:38:08 +08:00
yystopf f49d5d5c3a 更改: password参数传递使用加密后的 2024-11-20 11:52:26 +08:00
yystopf b55f24e6fe Merge branch 'pre_trustie_server' into trustie_server 2024-11-16 14:36:37 +08:00
yystopf 0336aa0cca Merge branch 'standalone_develop' into pre_trustie_server 2024-11-16 14:36:07 +08:00
yystopf 49e2b35a1e 更改:优化commit详情接口 2024-11-14 15:40:30 +08:00
yystopf a0138a8d7b Merge branch 'pre_trustie_server' into trustie_server 2024-11-08 13:57:57 +08:00
yystopf a3075c157b Merge branch 'standalone_develop' into pre_trustie_server 2024-11-08 13:55:39 +08:00
yystopf b5d3f69f21 修复:时间nil处理 2024-11-07 11:44:26 +08:00
yystopf 4f1a984a7f 新增:用户项目时间筛选项 2024-10-28 20:44:17 +08:00
yystopf e448433ced 新增:用户项目时间筛选项 2024-10-28 20:43:00 +08:00
yystopf c0ebb7431e 新增:用户项目时间筛选项 2024-10-28 20:28:17 +08:00
yystopf ba20708514 Merge branch 'pre_trustie_server' into trustie_server 2024-10-25 15:32:39 +08:00