Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into develop

e6005286 · ilal · fb5903e8 · 1211ee25 · e6005286 · e6005286
Commit e6005286 authored Nov 06, 2020 by ilal
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
+0 -0

src/main/java/cn/timer/api/controller/yggl/YgglController.java
+1 -1

No files found.
--- a/src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
+++ b/src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
--- a/src/main/java/cn/timer/api/controller/yggl/YgglController.java
+++ b/src/main/java/cn/timer/api/controller/yggl/YgglController.java
@@ -253,7 +253,7 @@ public class YgglController {
 		String phone = addygdaDto.getPhone();
 		Integer zjType = addygdaDto.getZjType();
 		String zjNum = addygdaDto.getZjNum();
-		int attgroupid = addygdaDto.getAttgroupid();//考勤组id
+		Integer attgroupid = addygdaDto.getAttgroupid();//考勤组id
 		boolean isvalid = true;
 		switch (zjType) {
 		case 0: