Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!375

src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java

@@ -125,6 +125,8 @@ public class SpmkServiceImpl implements SpmkService{
 			if(exe != null) {
 			if(exe != null) {
 				adD.setExecuteEmpNum(exe.getEmpNum());
 				adD.setExecuteEmpNum(exe.getEmpNum());
 				adD.setExecuteSts(exe.getSts());
 				adD.setExecuteSts(exe.getSts());
+				adD.setExeid(exe.getId());
+				adD.setExereid(exere.getId());
 			}
 			}
 		}
 		}
 		
 		

src/main/java/cn/timer/api/dto/spmk/SpmkApproveDetailDto.java

@@ -51,4 +51,8 @@ public class SpmkApproveDetailDto {
 	
 	
 	private Integer executeSts;
 	private Integer executeSts;
 	
 	
+	private Integer exeid;
+	
+	private Integer exereid;
+
 }
 }