Commit Graph

78 Commits (ec14b0557b1bca09f1a9cc52b5428de2a9d9056d)

Author SHA1 Message Date
lijun ec14b0557b update code 2024-10-15 23:22:33 +08:00
姜玉琦 181d2e9d53 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2024-10-15 00:33:26 +08:00
姜玉琦 48dda158ad 提交代码 2024-10-15 00:32:34 +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
姜玉琦 a0a14975af 提交 2024-10-13 16:20:02 +08:00
姜玉琦 5c1e1e427b 提交代码 2024-10-13 16:17:49 +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 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 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
姜玉琦 b9a5b6479d 提交代码 2024-09-23 01:25:06 +08:00
姜玉琦 4bd3fdf5e3 提交代码 2024-09-23 01:21:36 +08:00
姜玉琦 3f24b7a5dd Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2024-09-22 21:18:30 +08:00
姜玉琦 b0cd65d526 提交代码 2024-09-22 21:18:23 +08:00
lijun 7664525e84 update code 2024-09-21 23:56:36 +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 b1e743282f update code 2024-09-01 19:22:36 +08:00
haha e2f8f6b72e update code 2024-09-01 19:12:35 +08:00