Merge remote-tracking branch 'origin/master'

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

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

 package cn.timer.api.controller.spmk.service;
 package cn.timer.api.controller.spmk.service;
 
 
-import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Arrays;
 import java.util.List;
 import java.util.List;
@@ -13,7 +12,6 @@ import cn.timer.api.dao.spmk.*;
 import cn.timer.api.dto.spmk.FlowChildren;
 import cn.timer.api.dto.spmk.FlowChildren;
 import cn.timer.api.dto.spmk.Router;
 import cn.timer.api.dto.spmk.Router;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
-import net.sf.json.JSONArray;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
@@ -117,7 +115,8 @@ public class SpmkServiceImpl implements SpmkService{
 			adD.setRouter(jsonObject.parseObject(ad.getRouter(), Router.class));
 			adD.setRouter(jsonObject.parseObject(ad.getRouter(), Router.class));
 		}
 		}
 		if(ad.getFlowChildren()!=null) {
 		if(ad.getFlowChildren()!=null) {
-			adD.setFlowChildren(jsonObject.parseArray(ad.getFlowChildren(),  FlowChildren.class));
+			adD.setFlowChildren(jsonObject.parseArray(ad.getFlowChildren(), FlowChildren.class));
+
 		}
 		}
 		adD.setApproveExecuteRecord(listAer);
 		adD.setApproveExecuteRecord(listAer);
 		if(sum != null) {
 		if(sum != null) {