 haha
|
c0dc65db73
|
在合并 "dev_xd" 和 "origin/dev_xd" 前自动存档
|
2025-02-13 23:25:27 +08:00 |
姜玉琦
|
1c6c543523
|
提交代码
|
2025-02-13 00:20:27 +08:00 |
|
姜玉琦
|
e6cc6dbf52
|
Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd
|
2025-02-11 23:12:01 +08:00 |
|
姜玉琦
|
dc560902e3
|
提交代码
|
2025-02-11 23:11:51 +08:00 |
|
haha
|
e4479a11ad
|
修改绿能的导入和导出功能
|
2025-02-11 23:08:06 +08:00 |
|
haha
|
53193f94bb
|
修改人员花名册
|
2025-02-11 22:30:06 +08:00 |
|
haha
|
f4ecf0425f
|
Merge remote-tracking branch 'origin/dev_xd' into dev_xd
|
2025-02-11 22:29:35 +08:00 |
|
姜玉琦
|
44d498c2dc
|
提交diamagnetic
|
2025-02-11 15:01:56 +08:00 |
|
haha
|
55b1ed0d1e
|
Merge remote-tracking branch 'origin/dev_xd' into dev_xd
|
2025-02-10 01:16:54 +08:00 |
|
姜玉琦
|
acb89e5bc1
|
提交代码
|
2025-02-09 23:21:48 +08:00 |
|
haha
|
42f0beb605
|
修改用户管理和花名册列表增加人员岗位显示
|
2025-02-09 22:32:13 +08:00 |
|
haha
|
049a04bcc7
|
人员表中增加人员岗位
|
2025-02-09 21:56:02 +08:00 |
|
haha
|
1a9f23ee0b
|
修复绿碳功能问题
|
2025-02-06 22:28:43 +08:00 |
|
haha
|
3540ec00ee
|
修改前端功能
|
2025-02-05 23:47:15 +08:00 |
|
haha
|
9f3b2b35b2
|
update code
|
2025-02-02 22:46:26 +08:00 |
|
haha
|
b682453d76
|
解决冲突
|
2025-01-25 23:33:10 +08:00 |
|
haha
|
7978582c60
|
Merge remote-tracking branch 'origin/dev_xd' into dev_xd
|
2025-01-25 23:28:33 +08:00 |
|
haha
|
716b388d46
|
Revert "更新文件"
This reverts commit 886fe18434.
|
2025-01-25 23:26:46 +08:00 |
|
lj7788@126.com
|
af69e57c4f
|
修改考勤的保存功能
|
2025-01-25 13:03:47 +08:00 |
|
haha
|
886fe18434
|
更新文件
|
2025-01-24 23:40:35 +08:00 |
|
haha
|
19fb6e61f9
|
动态从身份证图片中获取数据
|
2025-01-24 23:37:20 +08:00 |
|
haha
|
42e7f1f2c0
|
修改花名册
|
2025-01-23 00:02:01 +08:00 |
|
姜玉琦
|
45af87f1f6
|
提交代码
|
2025-01-15 23:17:01 +08:00 |
|
姜玉琦
|
4dde6b7b36
|
提交代码
|
2025-01-15 00:49:37 +08:00 |
|
haha
|
5be1fdd66a
|
修改用户增加功能
|
2025-01-15 00:26:09 +08:00 |
|
haha
|
55dc571444
|
修改用户注册
|
2025-01-14 23:05:07 +08:00 |
|
haha
|
f91232d0e0
|
修改用户管理界面
|
2025-01-13 23:59:24 +08:00 |
|
lj7788@126.com
|
3d7ce9ea79
|
修改多租户功能
|
2025-01-11 17:14:40 +08:00 |
|
lj7788@126.com
|
1492f4ce31
|
修改多租户功能
|
2025-01-11 12:39:47 +08:00 |
|
lj7788@126.com
|
a408dec2ef
|
修改多租户
|
2025-01-10 17:45:27 +08:00 |
|
lj7788@126.com
|
e892f77673
|
系统用户改造
|
2025-01-09 22:20:40 +08:00 |
|
haha
|
72cf2d257c
|
update
|
2025-01-09 12:16:22 +08:00 |
|
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 |