Commit Graph

73 Commits (355d94c1b520bb97885dd4acfb6ae1055bb9c36c)

Author SHA1 Message Date
姜玉琦 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 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 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 dcd93473ed update code 2024-10-22 01:00:40 +08:00
lijun 3a494c9bb2 update code 2024-10-22 00:43:37 +08:00
lijun a0094c618a update code 2024-10-19 23:53:44 +08:00
lijun 396c18b2ff update code 2024-10-18 22:16:54 +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
姜玉琦 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 88c5960665 update code 2024-10-08 23:39:19 +08:00
lijun d27312f85b update code 2024-10-08 01:07:33 +08:00
姜玉琦 7352d2df76 提交代码 2024-10-07 22:43:53 +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 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
姜玉琦 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