Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!494

src/main/java/cn/timer/api/controller/spmk/SpmkController.java

@@ -795,7 +795,7 @@ public class SpmkController {
 			}
 			}
 			//我发起的
 			//我发起的
 			if(mySummaryQueryDto.getType() ==  0) {
 			if(mySummaryQueryDto.getType() ==  0) {
-				mySummaryQueryDto.setSts(null);
+//				mySummaryQueryDto.setSts(null);
 			}
 			}
 			// 缺-部门id 搜索
 			// 缺-部门id 搜索
 			IPage<SpmkApproveSummary> pageAs = spmkApproveSummaryMapper.selectPageByQueryForEmpNum(page, mySummaryQueryDto);
 			IPage<SpmkApproveSummary> pageAs = spmkApproveSummaryMapper.selectPageByQueryForEmpNum(page, mySummaryQueryDto);