姜玉琦
|
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
|
d641a73d5e
|
update code
|
2024-12-07 12:49:34 +08:00 |
|
lijun
|
685a6db03e
|
update code
|
2024-12-05 00:17:06 +08:00 |
|
lijun
|
c6596db86c
|
update code
|
2024-11-28 23:59:43 +08:00 |
|
lijun
|
8ed1dd28e1
|
增加大屏项目
|
2024-11-27 23:42:39 +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
|
3a494c9bb2
|
update code
|
2024-10-22 00:43:37 +08:00 |
|
lijun
|
396c18b2ff
|
update code
|
2024-10-18 22:16:54 +08:00 |
|
姜玉琦
|
6fa3c1aed7
|
提交代码
|
2024-10-18 14:20:19 +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
|
df400f758b
|
update code
|
2024-10-14 00:01:52 +08:00 |
|
lijun
|
23ad592b40
|
update code
|
2024-10-13 23:18:53 +08:00 |
|
姜玉琦
|
ea52f8e363
|
Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd
|
2024-10-13 15:40:39 +08:00 |
|
姜玉琦
|
4e2416fee1
|
提交代码
|
2024-10-13 15:40:28 +08:00 |
|
lijun
|
806f1fe08f
|
Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd
|
2024-10-13 15:10:40 +08:00 |
|
lijun
|
098dda6c65
|
update code
|
2024-10-13 15:10:30 +08:00 |
|
姜玉琦
|
17ae99df01
|
提交代码
|
2024-10-13 13:22:00 +08:00 |
|
lijun
|
3fe8f4c6c3
|
update code
|
2024-10-13 11:26:52 +08:00 |
|
姜玉琦
|
62b7274548
|
Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd
|
2024-10-13 11:26:34 +08:00 |
|
姜玉琦
|
0811adc4a9
|
Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd
# Conflicts:
# yanzhu-modules/yanzhu-manage/pom.xml
|
2024-10-13 11:26:27 +08:00 |
|
姜玉琦
|
3535b0d6a8
|
提交代码
|
2024-10-13 11:25:16 +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
|
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
|
cfe27cd9a6
|
update code
|
2024-10-02 00:26:14 +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 |
|
姜玉琦
|
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
|
10063c973d
|
update 增加视频管理
|
2024-09-01 20:35:00 +08:00 |
|
haha
|
6f7807a7ac
|
update code
|
2024-08-30 23:36:24 +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 |
|
姜玉琦
|
31f994df3b
|
提交代码
|
2024-08-19 23:38:21 +08:00 |
|
姜玉琦
|
aff4a1f7cc
|
初始化flowable
|
2024-08-19 00:41:24 +08:00 |
|
姜玉琦
|
9e4e5b8488
|
提交代码
|
2024-08-17 13:13:58 +08:00 |
|
姜玉琦
|
f84d7fa62e
|
jiangyuqi init commit
|
2024-08-17 12:12:01 +08:00 |