 haha
|
af4cfe9ff8
|
修改人员增加
|
2025-01-08 00:24:03 +08:00 |
姜玉琦
|
7b08ca2043
|
Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd
|
2025-01-08 00:22:29 +08:00 |
|
姜玉琦
|
785a80f661
|
提交代码
|
2025-01-08 00:22:22 +08:00 |
|
haha
|
abb4acb456
|
班组修改
|
2025-01-07 23:07:35 +08:00 |
|
haha
|
80e68aeae4
|
在合并 "dev_xd" 和 "origin/dev_xd" 前自动存档
|
2025-01-07 00:34:41 +08:00 |
|
姜玉琦
|
654d6bf001
|
提交代码
|
2025-01-07 00:26:43 +08:00 |
|
姜玉琦
|
0d4b0152d3
|
提交代码
|
2025-01-06 23:50:29 +08:00 |
|
haha
|
111be9687a
|
修改花名册bug
|
2025-01-06 23:33:36 +08:00 |
|
姜玉琦
|
757686d4fa
|
提交代码
|
2025-01-05 23:27:32 +08:00 |
|
姜玉琦
|
6cdfdf8da9
|
提交代码
|
2025-01-05 17:09:19 +08:00 |
|
haha
|
d7a12c5a2a
|
花名册管理修改保存
|
2025-01-05 15:44:13 +08:00 |
|
姜玉琦
|
e88f802800
|
Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd
|
2025-01-05 14:51:01 +08:00 |
|
姜玉琦
|
2bd827b5d2
|
提交代码
|
2025-01-05 14:50:51 +08:00 |
|
haha
|
9988754739
|
修改花名册
|
2025-01-05 01:03:30 +08:00 |
|
姜玉琦
|
5d0e06bc7b
|
1
|
2025-01-04 19:07:41 +08:00 |
|
haha
|
964a904cc1
|
修改后台里程碑管理保存的时候如果实际结束日期没有数据保存的时候会自动填充数据，需要改成不填充
|
2025-01-02 23:34:45 +08:00 |
|
haha
|
0ab4165788
|
修改图像不能上传问题
|
2025-01-02 22:40:43 +08:00 |
|
haha
|
011b937191
|
update .gitignore
|
2025-01-02 22:33:40 +08:00 |
|
姜玉琦
|
eaa5ad1167
|
提交代码
|
2024-12-30 23:08:35 +08:00 |
|
姜玉琦
|
b02c67b7a3
|
Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd
|
2024-12-30 00:31:13 +08:00 |
|
姜玉琦
|
f8ebc6679b
|
提交代码
|
2024-12-30 00:31:06 +08:00 |
|
haha
|
0b7801b302
|
视频监控大屏
|
2024-12-29 22:10:36 +08:00 |
|
姜玉琦
|
70f43b3973
|
Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd
|
2024-12-29 11:48:09 +08:00 |
|
姜玉琦
|
8877bef239
|
提交代码
|
2024-12-29 11:47:59 +08:00 |
|
haha
|
d3cfe40087
|
增加监控预览功能
|
2024-12-28 20:35:20 +08:00 |
|
lijun
|
9d75715d31
|
add videoMonitor
|
2024-12-28 09:52:23 +08:00 |
|
lijun
|
72fe8bdc16
|
增加项目成本产值管理
|
2024-12-24 23:41:35 +08:00 |
lj7788@126.com
|
d7bdc1849f
|
update code
|
2024-12-24 00:52:38 +08:00 |
|
姜玉琦
|
a58b7b8b03
|
Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd
|
2024-12-22 19:56:12 +08:00 |
|
姜玉琦
|
dd887b0496
|
提交代码
|
2024-12-22 19:56:04 +08:00 |
|
lijun
|
30fbba6b6b
|
update code
|
2024-12-22 00:40:50 +08:00 |
|
lijun
|
46650c7b71
|
update code
|
2024-12-21 12:53:39 +08:00 |
|
姜玉琦
|
497177d521
|
提交代码
|
2024-12-20 20:25:29 +08:00 |
|
姜玉琦
|
4a80de3acc
|
提交代码
|
2024-12-18 22:35:06 +08:00 |
|
lijun
|
d563d23b07
|
update code
|
2024-12-17 22:57:59 +08:00 |
|
姜玉琦
|
355d94c1b5
|
Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd
# Conflicts:
# yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoSubdeptsUsersService.java
# yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java
|
2024-12-17 20:27:18 +08:00 |
|
姜玉琦
|
ad0b751737
|
提交daim
|
2024-12-17 20:25:30 +08:00 |
|
lijun
|
234f32caad
|
update code
|
2024-12-14 22:48:31 +08:00 |
|
lijun
|
13c655fa1c
|
update code
|
2024-12-11 00:21:00 +08:00 |
|
lijun
|
300608c53e
|
update code
|
2024-12-09 00:25:42 +08:00 |
|
lijun
|
69e2d0cb35
|
update 增加碳因子管理
|
2024-12-09 00:08:09 +08:00 |
|
lijun
|
8ed1dd28e1
|
增加大屏项目
|
2024-11-27 23:42:39 +08:00 |
|
lijun
|
c62d6d3cc3
|
update code
|
2024-11-16 23:17:24 +08:00 |
Mac
|
727c7c414c
|
修改导入Project
|
2024-11-09 17:40:37 +08:00 |
|
lj7788
|
6b29ab9a30
|
增加任务管理
|
2024-11-09 10:05:00 +08:00 |
|
lijun
|
445908a5e8
|
update code
|
2024-10-22 23:22:56 +08:00 |
|
lijun
|
73df61a0a0
|
update
|
2024-10-22 01:02:50 +08:00 |
|
lijun
|
b8aadddcca
|
update
|
2024-10-22 01:01:54 +08:00 |
|
lijun
|
3a494c9bb2
|
update code
|
2024-10-22 00:43:37 +08:00 |
|
lijun
|
396c18b2ff
|
update code
|
2024-10-18 22:16:54 +08:00 |
|
lijun
|
c55ea4a88e
|
Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd
|
2024-10-16 00:24:58 +08:00 |
|
lijun
|
55070225cc
|
update code
|
2024-10-16 00:24:46 +08:00 |
|
姜玉琦
|
725f4290c1
|
Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd
|
2024-10-15 23:55:21 +08:00 |
|
姜玉琦
|
d39ec4c92f
|
提交代码
|
2024-10-15 23:55:13 +08:00 |
|
lijun
|
ec14b0557b
|
update code
|
2024-10-15 23:22:33 +08:00 |
|
lijun
|
23ad592b40
|
update code
|
2024-10-13 23:18:53 +08:00 |
|
lijun
|
098dda6c65
|
update code
|
2024-10-13 15:10:30 +08:00 |
|
lijun
|
3fe8f4c6c3
|
update code
|
2024-10-13 11:26:52 +08:00 |
|
lijun
|
1cf74add92
|
upate code
|
2024-10-13 00:15:53 +08:00 |
|
lijun
|
953f85ffc8
|
update code
|
2024-10-11 00:29:35 +08:00 |
|
lijun
|
7fcd920b52
|
update code
|
2024-10-10 00:34:39 +08:00 |
|
lijun
|
822d4add1f
|
update code
|
2024-10-09 00:34:25 +08:00 |
|
lijun
|
88c5960665
|
update code
|
2024-10-08 23:39:19 +08:00 |
|
lijun
|
d27312f85b
|
update code
|
2024-10-08 01:07:33 +08:00 |
|
姜玉琦
|
f618dee734
|
提交代码
|
2024-10-08 00:23:10 +08:00 |
|
姜玉琦
|
c7dd2063a6
|
Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd
|
2024-10-07 22:44:04 +08:00 |
|
姜玉琦
|
7352d2df76
|
提交代码
|
2024-10-07 22:43:53 +08:00 |
|
lijun
|
4e2e4c831f
|
解决冲突
|
2024-10-04 18:49:39 +08:00 |
|
lijun
|
deeaaa4ff4
|
update code
|
2024-10-04 18:47:45 +08:00 |
|
姜玉琦
|
25e37adf01
|
Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd
|
2024-10-04 14:41:11 +08:00 |
|
姜玉琦
|
a440b1c265
|
提交代码
|
2024-10-04 14:41:00 +08:00 |
|
lijun
|
7f0d164d4c
|
update code
|
2024-10-01 23:55:58 +08:00 |
|
lijun
|
2667592b63
|
花名册管理
|
2024-10-01 16:35:07 +08:00 |
|
姜玉琦
|
c51bd4bc1e
|
提交代码
|
2024-09-29 23:40:15 +08:00 |
|
姜玉琦
|
0d67d70ff4
|
提交代码
|
2024-09-25 01:00:37 +08:00 |
|
姜玉琦
|
b9a5b6479d
|
提交代码
|
2024-09-23 01:25:06 +08:00 |
|
姜玉琦
|
4bd3fdf5e3
|
提交代码
|
2024-09-23 01:21:36 +08:00 |
|
姜玉琦
|
b0cd65d526
|
提交代码
|
2024-09-22 21:18:23 +08:00 |
|
姜玉琦
|
31ae5e42a7
|
提交代码
|
2024-09-21 21:58:39 +08:00 |
|
姜玉琦
|
cf9af39a16
|
提交
|
2024-09-17 23:52:53 +08:00 |
|
姜玉琦
|
286e8abc0a
|
提交代码
|
2024-09-17 10:16:44 +08:00 |
|
姜玉琦
|
38419e4369
|
Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd
# Conflicts:
# yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/domain/SysUser.java
# yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysUserMapper.xml
# yanzhu-ui-vue3/src/views/manage/busTrainingVideo/index.vue
# yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue
# yanzhu-ui-vue3/src/views/tool/gen/index.vue
|
2024-09-10 00:08:01 +08:00 |
|
姜玉琦
|
ac7ee58db2
|
提交代码
|
2024-09-09 23:58:32 +08:00 |
|
haha
|
1c95a50d1c
|
增加项目管理功能
|
2024-09-04 00:20:16 +08:00 |
|
haha
|
9519000083
|
update code
|
2024-09-01 23:51:18 +08:00 |
|
haha
|
3a787ef690
|
update code
|
2024-09-01 22:29:20 +08:00 |
|
haha
|
10063c973d
|
update 增加视频管理
|
2024-09-01 20:35:00 +08:00 |
|
haha
|
0c877ddfeb
|
update code
|
2024-09-01 19:08:45 +08:00 |
|
haha
|
b0082e87da
|
update code
|
2024-09-01 17:36:53 +08:00 |
|
haha
|
6f7807a7ac
|
update code
|
2024-08-30 23:36:24 +08:00 |
|
姜玉琦
|
04384f6dc6
|
提交代码
|
2024-08-29 22:50:58 +08:00 |
|
姜玉琦
|
cfa648dbe6
|
提交代码
|
2024-08-26 01:11:23 +08:00 |
|
姜玉琦
|
77fa7476d8
|
提交代码
|
2024-08-25 21:26:05 +08:00 |
|
姜玉琦
|
589f8e7132
|
提交代码
|
2024-08-25 13:54:45 +08:00 |
|
姜玉琦
|
d8f63fa43b
|
提交代码
|
2024-08-25 13:31:26 +08:00 |
|
姜玉琦
|
8674561038
|
提交代码
|
2024-08-24 11:54:14 +08:00 |
|
姜玉琦
|
fe56d910ae
|
工作流
|
2024-08-22 16:28:35 +08:00 |
|
haha
|
72cf76c249
|
修改flowable
|
2024-08-21 23:41:28 +08:00 |
|
姜玉琦
|
73f42a722d
|
提交代码
|
2024-08-21 21:45:00 +08:00 |
|
姜玉琦
|
ecbb506578
|
提交
|
2024-08-20 23:13:34 +08:00 |