Merge remote-tracking branch 'origin/feature_20220222_huayi' into feature_20220222_huayi

# Conflicts:
#	src/main/java/cn/timer/api/controller/spmk/SpmkController.java
#	src/main/java/cn/timer/api/controller/spmk/service/SpmkService.java
#	src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java
#	src/main/java/cn/timer/api/dto/spmk/SpmkApproveSummaryDto.java

src/main/java/cn/timer/api/bean/spmk/SpmkApprovalG.java

@@ -58,5 +58,4 @@ public class SpmkApprovalG extends Model<SpmkApprovalG> {
 
 
 	@ApiModelProperty(value = "是否可编辑 0是 1否", example = "101")
 	@ApiModelProperty(value = "是否可编辑 0是 1否", example = "101")
 	private Integer isEditable;
 	private Integer isEditable;
-
 }
 }

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

@@ -114,7 +114,6 @@ public class SpmkController {
 	@Autowired
 	@Autowired
 	private SpmkApproveDetailDraftsMapper spmkApproveDetailDraftsMapper;
 	private SpmkApproveDetailDraftsMapper spmkApproveDetailDraftsMapper;
 
 
-
 	private static com.alibaba.fastjson.JSONObject jsonObject = new  com.alibaba.fastjson.JSONObject();
 	private static com.alibaba.fastjson.JSONObject jsonObject = new  com.alibaba.fastjson.JSONObject();
 
 
 	private boolean ISFIRST = true; // 第一次启动审批流程
 	private boolean ISFIRST = true; // 第一次启动审批流程
@@ -125,6 +124,7 @@ public class SpmkController {
 	@Autowired
 	@Autowired
 	private SpmkApproveDraftsMapper spmkApproveDraftsMapper;
 	private SpmkApproveDraftsMapper spmkApproveDraftsMapper;
 
 
+
 	//TODO 审批模板组
 	//TODO 审批模板组
 	/**
 	/**
 	 * 新增或编辑-审批模板组
 	 * 新增或编辑-审批模板组
@@ -758,19 +758,6 @@ public class SpmkController {
 
 
 	}
 	}
 
 
-	/**
-	 * 审批详情
-	 */
-	@GetMapping(value = "/select_drafts_detail/{id}")
-	@ApiOperation(value = "草稿箱审批详情", httpMethod = "GET", notes = "审批详情")
-	@Log(title = "审批-审批详情", businessType = BusinessType.OTHER)
-	public Result<Object> selectdd(@CurrentUser UserBean userBean,@PathVariable(required = true) Integer id) {
-		SpmkApproveDetailDto adD = spmkService.selectDraftsDetailByAsId(id);
-		System.out.println(ResultUtil.data(adD));
-		return ResultUtil.data(adD);
-
-	}
-
 	//TODO 审批人审批
 	//TODO 审批人审批
 	/**
 	/**
 	 * 审批人审批
 	 * 审批人审批

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

@@ -17,4 +17,5 @@ public interface SpmkService {
 	String addApproveDetail();
 	String addApproveDetail();
 
 
 	SpmkApproveDetailDto selectDraftsDetailByAsId(Integer asId);
 	SpmkApproveDetailDto selectDraftsDetailByAsId(Integer asId);
+
 }
 }

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

@@ -64,4 +64,5 @@ public class SpmkApproveSummaryDto{
 
 
 	@ApiModelProperty
 	@ApiModelProperty
 	private Integer id;
 	private Integer id;
+
 }
 }