Commit Graph

Select branches

Hide Pull Requests

dev

dev_2307

dev_4newlayout

master

Mono Color

• 3318104028 手动解决冲突 dev_2307 王家东 2023-08-03 17:20:06 +0800
• e518a2b422 手动解决冲突 王家东 2023-08-03 16:13:31 +0800
• e780934731 Merge branch 'dev_4newlayout' of http://182.92.169.222:3000/zhc077/projectManagement into dev_4newlayout dev_4newlayout xia 2023-08-03 16:10:39 +0800
• 6769e513f8 全部任务（管理员）-修复头像问题 xia 2023-08-03 16:09:40 +0800
• 2c9e266488 手动解决冲突（王家东） gegeya 2023-08-03 15:11:20 +0800
• d9f93d7d90 手动解决冲突（王家东） gegeya 2023-08-03 11:02:50 +0800
• c0c17e091b 手动解决冲突（王家东） gegeya 2023-08-03 11:02:32 +0800
• b72340ed24 Merge branch 'dev_2307' into dev dev 王家东 2023-08-03 10:25:15 +0800
• 465098281c 文件添加 zhc077 2023-08-03 10:13:37 +0800
• 815a52a1e3 Merge remote-tracking branch 'origin/dev_2307' into dev_2307 xuhao 2023-08-02 11:49:00 +0800
• 56b81576ac 导入规则 xuhao 2023-08-02 11:48:22 +0800
• 5a7c9c8fda Changes itcast 2023-08-02 11:40:48 +0800
• c91b3e024b Changes itcast 2023-08-02 11:19:31 +0800
• 3a76b263b2 修改睡眠，修改责任人之间中文逗号 guilongma 2023-08-02 11:09:44 +0800
• 1d4a92cc72 Merge remote-tracking branch 'origin/dev_2307' into dev_2307 guilongma 2023-08-02 10:20:28 +0800
• 740f140e1d 修改睡眠，修改责任人之间中文逗号 guilongma 2023-08-02 10:20:21 +0800
• bb952195ae Changes itcast 2023-08-02 09:52:46 +0800
• e57512d638 Merge remote-tracking branch 'origin/dev_2307' into dev_2307 zjh 2023-08-01 16:41:03 +0800
• 9759640383 导入规则修改 zjh 2023-08-01 16:40:55 +0800
• adf60baa4e 全部任务（第二版-修改bug） xia 2023-07-31 17:34:31 +0800
• 6e2aa27643 全部任务（第二版） xia 2023-07-31 17:01:10 +0800
• 1ea5a17f36 Changes itcast 2023-07-31 16:17:20 +0800
• ca7bd2cf58 Merge branch 'dev_4newlayout' of http://182.92.169.222:3000/zhc077/projectManagement into dev_4newlayout xia 2023-07-31 15:55:00 +0800
• 7d4a33b80d 模块管理导入功能交互 lijinyu 2023-07-31 15:41:11 +0800
• 5c6a761b33 Changes itcast 2023-07-31 15:35:08 +0800
• 30459b43dd Changes itcast 2023-07-31 14:27:45 +0800
• 5a001d23ec Changes itcast 2023-07-31 14:26:23 +0800
• a51b72b7da 模块管理导入功能交互 lijinyu 2023-07-31 12:24:12 +0800
• a63d094450 删除导入前校验中文名称英文名重复，有问题 guilongma 2023-07-31 11:55:50 +0800
• d21c877583 计算预计结束时间加上注释 chengyufei 2023-07-28 17:13:52 +0800
• dee8202b7a 计算预计结束时间2.0 chengyufei 2023-07-28 17:09:55 +0800
• 1943f257a6 Merge remote-tracking branch 'origin/dev_2307' into dev_2307 chengyufei 2023-07-28 17:09:21 +0800
• 0ae1dd1104 计算预计结束时间2.0 chengyufei 2023-07-28 17:08:02 +0800
• 61b3138621 Merge remote-tracking branch 'origin/dev_2307' into dev_2307 guilongma 2023-07-28 17:02:32 +0800
• 679dc7dd15 加入导入前校验中文名称英文名重复，将功能编码改为自动添加，解决任务时长、实际时长为负数问题 guilongma 2023-07-28 17:02:26 +0800
• 5126e009a2 导入规则修改 zjh 2023-07-28 16:11:02 +0800
• 9a5f1c11a1 模块管理导入功能交互 lijinyu 2023-07-28 15:29:56 +0800
• 7f6569753b Changes itcast 2023-07-28 13:08:01 +0800
• c33a3ab60c 添加导入实体的项目判断 mqh 2023-07-28 11:45:46 +0800
• ff8e8754b9 模块管理导入功能交互 lijinyu 2023-07-28 09:44:16 +0800
• ab6758c9a8 模块管理导入功能交互 lijinyu 2023-07-28 09:32:15 +0800
• 8f8515b792 模块管理导入功能交互 lijinyu 2023-07-28 09:23:49 +0800
• 7480cb66a3 添加导入实体表,模块绑定实体 mqh 2023-07-26 18:45:15 +0800
• ae38db469c Merge remote-tracking branch 'origin/dev_2307' into dev_2307 guilongma 2023-07-26 17:18:15 +0800
• 2707ec6acd 空白行校验 guilongma 2023-07-26 17:18:10 +0800
• ef40ab58f4 模块管理导入功能交互 lijinyu 2023-07-26 16:57:17 +0800
• 7f392c6c26 Changes itcast 2023-07-26 16:44:56 +0800
• 9d748bffeb 解决实体管理 结构图无法上传 shiji 2023-07-26 15:07:27 +0800
• b4e0df4711 Changes itcast 2023-07-26 13:47:35 +0800
• b34b278fb7 模块管理导入功能交互 lijinyu 2023-07-26 13:08:44 +0800
• 230822887e Merge remote-tracking branch 'origin/dev_2307' into dev_2307 guilongma 2023-07-26 11:58:04 +0800
• 9290f843b5 新增改为增加，单元格格式校验 guilongma 2023-07-26 11:57:57 +0800
• 1bdb937ec2 模块管理导入功能交互 lijinyu 2023-07-26 11:42:03 +0800
• 7e0e5ded4d Changes itcast 2023-07-26 11:31:40 +0800
• 862ee3c6ad Merge remote-tracking branch 'origin/dev_2307' into dev_2307 zjh 2023-07-26 11:14:00 +0800
• 89628bd829 导入规则修改 zjh 2023-07-26 11:13:53 +0800
• aa548e6e1e Merge remote-tracking branch 'origin/dev_2307' into dev_2307 mqh 2023-07-26 11:09:40 +0800
• 4fb7fe4a8c 添加导入实体表结构字段 mqh 2023-07-26 11:09:24 +0800
• 67e31657d2 模块管理导入功能交互 lijinyu 2023-07-26 10:49:20 +0800
• e9cc7c6ac8 解决 itcast 2023-07-26 10:33:54 +0800
• 217b41a9b7 模块管理导入功能交互 lijinyu 2023-07-26 10:28:31 +0800
• 1a058fb39c Changes itcast 2023-07-26 10:03:35 +0800
• 65a5b17237 导入规则修改 zjh 2023-07-25 21:34:06 +0800
• b8c165db8a Merge branch 'dev_4newlayout' of http://182.92.169.222:3000/zhc077/projectManagement into dev_4newlayout deng 2023-07-25 10:19:09 +0800
• d212e8af19 dyl deng 2023-07-25 10:19:07 +0800
• 23bed63496 dyl deng 2023-07-25 09:07:27 +0800
• 37dfa02311 Merge remote-tracking branch 'origin/dev_2307' into dev_2307 zjh 2023-07-24 17:13:16 +0800
• 5bea448de0 导入规则修改 zjh 2023-07-24 17:12:59 +0800
• 476e56d02b Merge remote-tracking branch 'origin/dev_2307' into dev_2307 guilongma 2023-07-24 17:07:40 +0800
• dabdb3c04a 功能导入 实现交互，修改校验模块名称规则 guilongma 2023-07-24 17:07:29 +0800
• 84f2b601c1 Merge remote-tracking branch 'origin/dev_2307' into dev_2307 mqh 2023-07-24 17:04:44 +0800
• 5b8d9ba166 修改导入实体 mqh 2023-07-24 17:02:15 +0800
• ed181a656e 模块管理导入功能交互 lijinyu 2023-07-24 16:22:53 +0800
• 24740d7d44 修改导入实体 mqh 2023-07-24 15:26:27 +0800
• 7eaa43a256 Merge branch 'dev_4newlayout' of http://182.92.169.222:3000/zhc077/projectManagement into dev_4newlayout gegeya 2023-07-24 15:14:37 +0800
• a52f8d4d40 listmain gegeya 2023-07-24 15:13:52 +0800
• b9884b1c45 Changes itcast 2023-07-24 12:05:26 +0800
• f8f15ca2a4 dyl deng 2023-07-24 12:03:17 +0800
• a5b6b52d34 Changes itcast 2023-07-24 11:24:00 +0800
• 1140f1f7b5 Changes itcast 2023-07-24 11:12:45 +0800
• b863b76151 Changes itcast 2023-07-24 10:58:41 +0800
• e68b7b4658 Merge remote-tracking branch 'origin/dev_2307' into dev_2307 zjh 2023-07-24 09:35:49 +0800
• f292df51f0 导入规则修改 zjh 2023-07-24 09:35:11 +0800
• fd4cc1135c 功能导入修改功能编码校验，添加进度条 guilongma 2023-07-24 09:11:02 +0800
• f542e537e7 Merge remote-tracking branch 'origin/dev_2307' into dev_2307 zjh 2023-07-24 08:41:50 +0800
• 1094c16868 导入规则修改 zjh 2023-07-24 08:41:40 +0800
• ca6add2f7f Changes itcast 2023-07-23 11:38:46 +0800
• 220c517379 Changes itcast 2023-07-22 21:52:26 +0800
• cae704d973 修改实体字段 mqh 2023-07-22 16:20:54 +0800
• 2a962992df 优化导入界面 mqh 2023-07-22 15:57:49 +0800
• cc98e3b7d9 模块管理导入功能交互 lijinyu 2023-07-22 11:17:44 +0800
• 1941280f92 导入规则修改 zjh 2023-07-22 11:16:05 +0800
• 9a9515c83a Merge branch 'dev_4newlayout' of http://182.92.169.222:3000/zhc077/projectManagement into dev_4newlayout xia 2023-07-21 16:46:05 +0800
• 077a3a36e6 修改全部任务页面 xia 2023-07-21 16:44:27 +0800
• e4a0aa80de 添加导出实体模板 mqh 2023-07-21 15:56:00 +0800
• ea1b6c22dc Merge remote-tracking branch 'origin/dev_2307' into dev_2307 mqh 2023-07-21 15:54:54 +0800
• d3a823f842 导入规则修改 zjh 2023-07-21 15:40:52 +0800
• 9d3c63b1ab Merge remote-tracking branch 'origin/dev_2307' into dev_2307 mqh 2023-07-21 15:26:58 +0800
• 42797ee4be 更新导入功能 mqh 2023-07-21 15:26:54 +0800
• 568950cba6 任务模块 shiji 2023-07-21 14:50:12 +0800