diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectTemplateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectTemplateController.java
deleted file mode 100644
index b90c2522..00000000
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectTemplateController.java
+++ /dev/null
@@ -1,222 +0,0 @@
-package com.xm.core.ctrl;
-
-import com.mdp.core.entity.Tips;
-import com.mdp.core.err.BizException;
-import com.mdp.core.utils.RequestUtils;
-import com.mdp.mybatis.PageUtils;
-import com.xm.core.entity.XmProjectTemplate;
-import com.xm.core.service.XmProjectTemplateService;
-import io.swagger.annotations.*;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * url编制采用rest风格,如对XM.xm_project_template xm_project_template的操作有增删改查,对应的url分别为:<br>
- *  新增: xm/xmProjectTemplate/add <br>
- *  查询: xm/xmProjectTemplate/list<br>
- *  模糊查询: xm/xmProjectTemplate/listKey<br>
- *  修改: xm/xmProjectTemplate/edit <br>
- *  删除: xm/xmProjectTemplate/del<br>
- *  批量删除: xm/xmProjectTemplate/batchDel<br>
- * 组织 com.qqkj  顶级模块 oa 大模块 xm 小模块 <br>
- * 实体 XmProjectTemplate 表 XM.xm_project_template 当前主键(包括多主键): id; 
- ***/
-@RestController("xm.core.xmProjectTemplateController")
-@RequestMapping(value="/**/xm/core/xmProjectTemplate")
-@Api(tags={"xm_project_template操作接口"})
-public class XmProjectTemplateController {
-	
-	static Log logger=LogFactory.getLog(XmProjectTemplateController.class);
-	
-	@Autowired
-	private XmProjectTemplateService xmProjectTemplateService;
-	 
-		
- 
-	
-	@ApiOperation( value = "查询xm_project_template信息列表",notes="listXmProjectTemplate,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
-	@ApiImplicitParams({  
-		@ApiImplicitParam(name="id",value="项目编号,主键",required=false),
-		@ApiImplicitParam(name="code",value="项目代号",required=false),
-		@ApiImplicitParam(name="name",value="项目名称",required=false),
-		@ApiImplicitParam(name="xmType",value="项目类型",required=false),
-		@ApiImplicitParam(name="startTime",value="项目开始时间",required=false),
-		@ApiImplicitParam(name="endTime",value="项目结束时间",required=false),
-		@ApiImplicitParam(name="urgent",value="紧急程度",required=false),
-		@ApiImplicitParam(name="priority",value="优先程度",required=false),
-		@ApiImplicitParam(name="description",value="项目描述",required=false),
-		@ApiImplicitParam(name="createUserid",value="项目创建人编号",required=false),
-		@ApiImplicitParam(name="createUsername",value="项目创建人",required=false),
-		@ApiImplicitParam(name="createTime",value="创建时间",required=false),
-		@ApiImplicitParam(name="assess",value="项目考核",required=false),
-		@ApiImplicitParam(name="assessRemarks",value="考核备注",required=false),
-		@ApiImplicitParam(name="status",value="项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停",required=false),
-		@ApiImplicitParam(name="branchId",value="机构编号",required=false),
-		@ApiImplicitParam(name="planTotalCost",value="总预算",required=false),
-		@ApiImplicitParam(name="bizProcInstId",value="当前流程实例编号",required=false),
-		@ApiImplicitParam(name="bizFlowState",value="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除",required=false),
-		@ApiImplicitParam(name="planNouserAt",value="非人力成本总预算-应该大于或等于计划非人力总成本",required=false),
-		@ApiImplicitParam(name="planInnerUserAt",value="内部人力成本总预算-应该大于或等于计划内部人力总成本",required=false),
-		@ApiImplicitParam(name="planOutUserAt",value="外购人力成本总预算-应该大于或等于计划外购人力总成本",required=false),
-		@ApiImplicitParam(name="locked",value="是否锁定整个项目不允许变化0否1是",required=false),
-		@ApiImplicitParam(name="baseTime",value="基线时间",required=false),
-		@ApiImplicitParam(name="baseRemark",value="基线备注",required=false),
-		@ApiImplicitParam(name="baselineId",value="基线主键",required=false),
-		@ApiImplicitParam(name="planWorkload",value="总预算工作量-应该大于或等于计划总工作量",required=false),
-		@ApiImplicitParam(name="totalReceivables",value="总预计收款金额",required=false),
-		@ApiImplicitParam(name="budgetMarginRate",value="预估毛利率",required=false),
-		@ApiImplicitParam(name="contractAmt",value="合同总金额",required=false),
-		@ApiImplicitParam(name="planInnerUserPrice",value="内部人力成本单价元/人时",required=false),
-		@ApiImplicitParam(name="planOutUserPrice",value="外购人力成本单价元/人时",required=false),
-		@ApiImplicitParam(name="planOutUserCnt",value="外购人数",required=false),
-		@ApiImplicitParam(name="planInnerUserCnt",value="内部人数",required=false),
-		@ApiImplicitParam(name="planWorkingHours",value="预计工作小时数目",required=false),
-		@ApiImplicitParam(name="taxRate",value="税率",required=false),
-		@ApiImplicitParam(name="planInnerUserWorkload",value="内部人力总工作量-应该大于或等于计划内部人力总成本",required=false),
-		@ApiImplicitParam(name="planOutUserWorkload",value="外购人力总工作量-应该大于或等于计划外购人力总成本",required=false),
-		@ApiImplicitParam(name="productId",value="产品编号",required=false),
-		@ApiImplicitParam(name="productName",value="产品名称",required=false),
-		@ApiImplicitParam(name="templateId",value="项目模板编号",required=false),
-		@ApiImplicitParam(name="tcuserid",value="模板创建人编号",required=false),
-		@ApiImplicitParam(name="tcusername",value="模板创建人姓名",required=false),
-		@ApiImplicitParam(name="tremark",value="模板备注",required=false),
-		@ApiImplicitParam(name="tctime",value="模板创建时间",required=false),
-		@ApiImplicitParam(name="tcbranchId",value="模板创建机构编号",required=false),
-		@ApiImplicitParam(name="shareScope",value="共享范围0-全部,1-本机构",required=false),
-		@ApiImplicitParam(name="pageSize",value="每页记录数",required=false),
-		@ApiImplicitParam(name="currentPage",value="当前页码,从1开始",required=false),
-		@ApiImplicitParam(name="total",value="总记录数,服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算",required=false),
-		@ApiImplicitParam(name="orderFields",value="排序列 如性别、学生编号排序 ['sex','studentId']",required=false),
-		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
-	})
-	@ApiResponses({
-		@ApiResponse(code = 200,response= XmProjectTemplate.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
-	})
-	@RequestMapping(value="/list",method=RequestMethod.GET)
-	public Map<String,Object> listXmProjectTemplate( @RequestParam Map<String,Object> xmProjectTemplate){
-		Map<String,Object> m = new HashMap<>(); 
-		RequestUtils.transformArray(xmProjectTemplate, "ids");
-		PageUtils.startPage(xmProjectTemplate);
-		List<Map<String,Object>>	xmProjectTemplateList = xmProjectTemplateService.selectListMapByWhere(xmProjectTemplate);	//列出XmProjectTemplate列表
-		PageUtils.responePage(m, xmProjectTemplateList);
-		m.put("data",xmProjectTemplateList);
-		Tips tips=new Tips("查询成功");
-		m.put("tips", tips);
-		return m;
-	}
-	
- 
-	
-	/***/
-	@ApiOperation( value = "新增一条xm_project_template信息",notes="addXmProjectTemplate,主键如果为空，后台自动生成")
-	@ApiResponses({
-		@ApiResponse(code = 200,response=XmProjectTemplate.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
-	}) 
-	@RequestMapping(value="/add",method=RequestMethod.POST)
-	public Map<String,Object> addXmProjectTemplate(@RequestBody XmProjectTemplate xmProjectTemplate) {
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功新增一条数据");
-		try{
-			if(StringUtils.isEmpty(xmProjectTemplate.getId())) {
-				xmProjectTemplate.setId(xmProjectTemplateService.createKey("id"));
-			}else{
-				 XmProjectTemplate xmProjectTemplateQuery = new  XmProjectTemplate(xmProjectTemplate.getId());
-				if(xmProjectTemplateService.countByWhere(xmProjectTemplateQuery)>0){
-					tips.setFailureMsg("编号重复，请修改编号再提交");
-					m.put("tips", tips);
-					return m;
-				}
-			}
-			xmProjectTemplateService.insert(xmProjectTemplate);
-			m.put("data",xmProjectTemplate);
-		}catch (BizException e) { 
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}  
-		m.put("tips", tips);
-		return m;
-	}
-	
-	
-	/***/
-	@ApiOperation( value = "删除一条xm_project_template信息",notes="delXmProjectTemplate,仅需要上传主键字段")
-	@ApiResponses({
-		@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}")
-	}) 
-	@RequestMapping(value="/del",method=RequestMethod.POST)
-	public Map<String,Object> delXmProjectTemplate(@RequestBody XmProjectTemplate xmProjectTemplate){
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功删除一条数据");
-		try{
-			xmProjectTemplateService.deleteByPk(xmProjectTemplate);
-		}catch (BizException e) { 
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}  
-		m.put("tips", tips);
-		return m;
-	}
-	 
-	
-	/***/
-	@ApiOperation( value = "根据主键修改一条xm_project_template信息",notes="editXmProjectTemplate")
-	@ApiResponses({
-		@ApiResponse(code = 200,response=XmProjectTemplate.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
-	}) 
-	@RequestMapping(value="/edit",method=RequestMethod.POST)
-	public Map<String,Object> editXmProjectTemplate(@RequestBody XmProjectTemplate xmProjectTemplate) {
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功更新一条数据");
-		try{
-			xmProjectTemplateService.updateByPk(xmProjectTemplate);
-			m.put("data",xmProjectTemplate);
-		}catch (BizException e) { 
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}  
-		m.put("tips", tips);
-		return m;
-	}
-	
-	
-
-	
-	/***/
-	@ApiOperation( value = "根据主键列表批量删除xm_project_template信息",notes="batchDelXmProjectTemplate,仅需要上传主键字段")
-	@ApiResponses({
-		@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}")
-	}) 
-	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
-	public Map<String,Object> batchDelXmProjectTemplate(@RequestBody List<XmProjectTemplate> xmProjectTemplates) {
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功删除"+xmProjectTemplates.size()+"条数据"); 
-		try{ 
-			xmProjectTemplateService.batchDelete(xmProjectTemplates);
-		}catch (BizException e) { 
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}  
-		m.put("tips", tips);
-		return m;
-	} 
-	
-}
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectService.java
index 3b4444d0..12e2e4c3 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmProjectService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmProjectService.java
@@ -34,9 +34,6 @@ public class XmProjectService extends BaseService {
 
     @Autowired
     XmProjectService xmProjectService;
- 
-    @Autowired
-    XmProjectBaselineService xmProjectBaselineService;
 
       
 
@@ -371,7 +368,6 @@ public class XmProjectService extends BaseService {
 		XmProject p=new XmProject();
 		p.setId(projectId);
 		XmProject p2=this.selectOneObject(p);
-		this.xmProjectBaselineService.createBaseline(p2,remark);
 	}
 }