diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmGroupController.java
similarity index 94%
rename from xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java
rename to xm-core/src/main/java/com/xm/core/ctrl/XmGroupController.java
index 5da8e3d0..00871b87 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmGroupController.java
@@ -1,6 +1,5 @@
 package com.xm.core.ctrl;
 
-import com.alibaba.fastjson.JSON;
 import com.mdp.core.entity.Tips;
 import com.mdp.core.err.BizException;
 import com.mdp.core.utils.RequestUtils;
@@ -12,9 +11,8 @@ import com.mdp.safe.client.utils.LoginUtils;
 import com.xm.core.entity.XmProduct;
 import com.xm.core.entity.XmProject;
 import com.xm.core.entity.XmProjectGroup;
-import com.xm.core.entity.XmProjectGroupUser;
 import com.xm.core.service.XmProductService;
-import com.xm.core.service.XmProjectGroupService;
+import com.xm.core.service.XmGroupService;
 import com.xm.core.service.XmProjectService;
 import com.xm.core.service.XmRecordService;
 import com.xm.core.service.cache.XmProjectGroupCacheService;
@@ -34,7 +32,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
- * url编制采用rest风格,如对XM.xm_project_group xm_project_group的操作有增删改查,对应的url分别为:<br>
+ * url编制采用rest风格,如对XM.xm_group xm_group的操作有增删改查,对应的url分别为:<br>
  *  新增: xm/xmProjectGroup/add <br>
  *  查询: xm/xmProjectGroup/list<br>
  *  模糊查询: xm/xmProjectGroup/listKey<br>
@@ -42,17 +40,17 @@ import java.util.stream.Collectors;
  *  删除: xm/xmProjectGroup/del<br>
  *  批量删除: xm/xmProjectGroup/batchDel<br>
  * 组织 com.qqkj  顶级模块 oa 大模块 xm 小模块 <br>
- * 实体 XmProjectGroup 表 XM.xm_project_group 当前主键(包括多主键): id; 
+ * 实体 XmProjectGroup 表 XM.xm_group 当前主键(包括多主键): id; 
  ***/
-@RestController("xm.core.xmProjectGroupController")
-@RequestMapping(value="/**/xm/core/xmProjectGroup")
-@Api(tags={"xm_project_group操作接口"})
-public class XmProjectGroupController {
+@RestController("xm.core.xmGroupController")
+@RequestMapping(value="/**/xm/core/xmGroup")
+@Api(tags={"xm_group操作接口"})
+public class XmGroupController {
 	
-	static Log logger=LogFactory.getLog(XmProjectGroupController.class);
+	static Log logger=LogFactory.getLog(XmGroupController.class);
 	
 	@Autowired
-	private XmProjectGroupService xmProjectGroupService;
+	private XmGroupService xmProjectGroupService;
 
 
 	@Autowired
@@ -174,7 +172,7 @@ public class XmProjectGroupController {
 		
  
 	
-	@ApiOperation( value = "查询xm_project_group信息列表",notes="listXmProjectGroup,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
+	@ApiOperation( value = "查询xm_group信息列表",notes="listXmProjectGroup,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
 	@ApiImplicitParams({  
 		@ApiImplicitParam(name="id",value="主键,主键",required=false),
 		@ApiImplicitParam(name="groupName",value="团队名称",required=false),
@@ -209,7 +207,7 @@ public class XmProjectGroupController {
 		return m;
 	}
 
-	@ApiOperation( value = "新增一条xm_project_group信息",notes="addXmProjectGroup,主键如果为空，后台自动生成")
+	@ApiOperation( value = "新增一条xm_group信息",notes="addXmProjectGroup,主键如果为空，后台自动生成")
 	@ApiResponses({
 		@ApiResponse(code = 200,response=XmProjectGroup.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
 	})
@@ -295,7 +293,7 @@ public class XmProjectGroupController {
 		return m;
 	}
 
-	@ApiOperation( value = "删除一条xm_project_group信息",notes="delXmProjectGroup,仅需要上传主键字段")
+	@ApiOperation( value = "删除一条xm_group信息",notes="delXmProjectGroup,仅需要上传主键字段")
 	@ApiResponses({
 		@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}")
 	}) 
@@ -365,7 +363,7 @@ public class XmProjectGroupController {
 	
 
 
-	@ApiOperation( value = "根据主键列表批量删除xm_project_group信息",notes="batchDelXmProjectGroup,仅需要上传主键字段")
+	@ApiOperation( value = "根据主键列表批量删除xm_group信息",notes="batchDelXmProjectGroup,仅需要上传主键字段")
 	@ApiResponses({
 		@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}")
 	}) 
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupStateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmGroupStateController.java
similarity index 91%
rename from xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupStateController.java
rename to xm-core/src/main/java/com/xm/core/ctrl/XmGroupStateController.java
index a972daf1..c92b6fc3 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupStateController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmGroupStateController.java
@@ -5,7 +5,7 @@ import com.mdp.core.err.BizException;
 import com.mdp.core.utils.RequestUtils;
 import com.mdp.mybatis.PageUtils;
 import com.xm.core.entity.XmProjectGroupState;
-import com.xm.core.service.XmProjectGroupStateService;
+import com.xm.core.service.XmGroupStateService;
 import io.swagger.annotations.*;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -17,25 +17,25 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * url编制采用rest风格,如对XM.xm_project_group_state 功能状态表,无需前端维护，所有数据由汇总统计得出的操作有增删改查,对应的url分别为:<br>
- *  新增: core/xmProjectGroupState/add <br>
- *  查询: core/xmProjectGroupState/list<br>
- *  模糊查询: core/xmProjectGroupState/listKey<br>
- *  修改: core/xmProjectGroupState/edit <br>
- *  删除: core/xmProjectGroupState/del<br>
- *  批量删除: core/xmProjectGroupState/batchDel<br>
+ * url编制采用rest风格,如对XM.xm_group_state 功能状态表,无需前端维护，所有数据由汇总统计得出的操作有增删改查,对应的url分别为:<br>
+ *  新增: core/xmGroupState/add <br>
+ *  查询: core/xmGroupState/list<br>
+ *  模糊查询: core/xmGroupState/listKey<br>
+ *  修改: core/xmGroupState/edit <br>
+ *  删除: core/xmGroupState/del<br>
+ *  批量删除: core/xmGroupState/batchDel<br>
  * 组织 com.qqkj  顶级模块 xm 大模块 core 小模块 <br>
- * 实体 XmProjectGroupState 表 XM.xm_project_group_state 当前主键(包括多主键): id; 
+ * 实体 XmProjectGroupState 表 XM.xm_group_state 当前主键(包括多主键): id; 
  ***/
-@RestController("xm.core.xmProjectGroupStateController")
-@RequestMapping(value="/**/core/xmProjectGroupState")
+@RestController("xm.core.xmGroupStateController")
+@RequestMapping(value="/**/core/xmGroupState")
 @Api(tags={"功能状态表,无需前端维护，所有数据由汇总统计得出操作接口"})
-public class XmProjectGroupStateController {
+public class XmGroupStateController {
 	
-	static Log logger=LogFactory.getLog(XmProjectGroupStateController.class);
+	static Log logger=LogFactory.getLog(XmGroupStateController.class);
 	
 	@Autowired
-	private XmProjectGroupStateService xmProjectGroupStateService;
+	private XmGroupStateService xmProjectGroupStateService;
 	 
 		
  
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupUserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmGroupUserController.java
similarity index 93%
rename from xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupUserController.java
rename to xm-core/src/main/java/com/xm/core/ctrl/XmGroupUserController.java
index e592ac4f..da09a4a0 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupUserController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmGroupUserController.java
@@ -9,10 +9,8 @@ import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.xm.core.entity.XmProduct;
 import com.xm.core.entity.XmProject;
-import com.xm.core.entity.XmProjectGroup;
 import com.xm.core.entity.XmProjectGroupUser;
 import com.xm.core.service.*;
-import com.xm.core.service.cache.XmProjectGroupCacheService;
 import com.xm.core.service.push.XmPushMsgService;
 import com.xm.core.vo.XmProjectGroupVo;
 import io.swagger.annotations.*;
@@ -28,25 +26,25 @@ import java.util.stream.Collectors;
 import static com.mdp.core.utils.BaseUtils.map;
 
 /**
- * url编制采用rest风格,如对XM.xm_project_group_user xm_project_group_user的操作有增删改查,对应的url分别为:<br>
- *  新增: core/xmProjectGroupUser/add <br>
- *  查询: core/xmProjectGroupUser/list<br>
- *  模糊查询: core/xmProjectGroupUser/listKey<br>
- *  修改: core/xmProjectGroupUser/edit <br>
- *  删除: core/xmProjectGroupUser/del<br>
- *  批量删除: core/xmProjectGroupUser/batchDel<br>
+ * url编制采用rest风格,如对XM.xm_group_user xm_group_user的操作有增删改查,对应的url分别为:<br>
+ *  新增: core/xmGroupUser/add <br>
+ *  查询: core/xmGroupUser/list<br>
+ *  模糊查询: core/xmGroupUser/listKey<br>
+ *  修改: core/xmGroupUser/edit <br>
+ *  删除: core/xmGroupUser/del<br>
+ *  批量删除: core/xmGroupUser/batchDel<br>
  * 组织 com.qqkj  顶级模块 xm 大模块 core 小模块 <br>
- * 实体 XmProjectGroupUser 表 XM.xm_project_group_user 当前主键(包括多主键): id; 
+ * 实体 XmProjectGroupUser 表 XM.xm_group_user 当前主键(包括多主键): id; 
  ***/
-@RestController("xm.core.xmProjectGroupUserController")
-@RequestMapping(value="/**/core/xmProjectGroupUser")
-@Api(tags={"xm_project_group_user操作接口"})
-public class XmProjectGroupUserController {
+@RestController("xm.core.xmGroupUserController")
+@RequestMapping(value="/**/core/xmGroupUser")
+@Api(tags={"xm_group_user操作接口"})
+public class XmGroupUserController {
 	
-	static Log logger=LogFactory.getLog(XmProjectGroupUserController.class);
+	static Log logger=LogFactory.getLog(XmGroupUserController.class);
 	
 	@Autowired
-	private XmProjectGroupUserService xmProjectGroupUserService;
+	private XmGroupUserService xmProjectGroupUserService;
 
 
 	@Autowired
@@ -57,7 +55,7 @@ public class XmProjectGroupUserController {
 	private XmProductService xmProductService;
 
 	@Autowired
-	XmProjectGroupService xmProjectGroupService;
+	XmGroupService xmProjectGroupService;
 
 
 	@Autowired
@@ -67,7 +65,7 @@ public class XmProjectGroupUserController {
 	XmPushMsgService pushMsgService;
  
 	
-	@ApiOperation( value = "查询xm_project_group_user信息列表",notes="listXmProjectGroupUser,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
+	@ApiOperation( value = "查询xm_group_user信息列表",notes="listXmProjectGroupUser,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
 	@ApiImplicitParams({  
 		@ApiImplicitParam(name="id",value="主键,主键",required=false),
 		@ApiImplicitParam(name="joinTime",value="加入时间",required=false),
@@ -104,7 +102,7 @@ public class XmProjectGroupUserController {
 	
  
 
-	@ApiOperation( value = "新增一条xm_project_group_user信息",notes="addXmProjectGroupUser,主键如果为空，后台自动生成")
+	@ApiOperation( value = "新增一条xm_group_user信息",notes="addXmProjectGroupUser,主键如果为空，后台自动生成")
 	@ApiResponses({
 		@ApiResponse(code = 200,response=XmProjectGroupUser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
 	}) 
@@ -194,7 +192,7 @@ public class XmProjectGroupUserController {
 		return m;
 	}
 
-	@ApiOperation( value = "删除一条xm_project_group_user信息",notes="delXmProjectGroupUser,仅需要上传主键字段")
+	@ApiOperation( value = "删除一条xm_group_user信息",notes="delXmProjectGroupUser,仅需要上传主键字段")
 	@ApiResponses({
 		@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}")
 	}) 
@@ -279,7 +277,7 @@ public class XmProjectGroupUserController {
 		return m;
 	}
 
-	@ApiOperation( value = "根据主键修改一条xm_project_group_user信息",notes="editXmProjectGroupUser")
+	@ApiOperation( value = "根据主键修改一条xm_group_user信息",notes="editXmProjectGroupUser")
 	@ApiResponses({
 		@ApiResponse(code = 200,response=XmProjectGroupUser.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
 	}) 
@@ -361,7 +359,7 @@ public class XmProjectGroupUserController {
 	}
 
 
-	@ApiOperation( value = "根据主键列表批量新增xm_project_group_user信息",notes="batchAddXmProjectGroupUser,仅需要上传主键字段")
+	@ApiOperation( value = "根据主键列表批量新增xm_group_user信息",notes="batchAddXmProjectGroupUser,仅需要上传主键字段")
 	@ApiResponses({
 			@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}")
 	})
@@ -491,7 +489,7 @@ public class XmProjectGroupUserController {
 	}
 
 
-	@ApiOperation( value = "根据主键列表批量删除xm_project_group_user信息",notes="batchDelXmProjectGroupUser,仅需要上传主键字段")
+	@ApiOperation( value = "根据主键列表批量删除xm_group_user信息",notes="batchDelXmProjectGroupUser,仅需要上传主键字段")
 	@ApiResponses({
 		@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}")
 	}) 
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java
index 0e9eda60..27243dec 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java
@@ -2,15 +2,10 @@ 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.core.utils.ResponseHelper;
-import com.mdp.mybatis.PageUtils;
-import com.mdp.safe.client.entity.User;
-import com.mdp.safe.client.utils.LoginUtils;
-import com.xm.core.entity.XmIteration;
 import com.xm.core.entity.XmMenu;
 import com.xm.core.service.XmMenuService;
-import com.xm.core.service.XmProjectGroupService;
+import com.xm.core.service.XmGroupService;
 import com.xm.core.service.XmRecordService;
 import com.xm.core.service.push.XmMenuPushMsgService;
 import com.xm.core.vo.XmIterationMenuVo;
@@ -52,7 +47,7 @@ public class XmIterationMenuController {
 
 
 	@Autowired
-	XmProjectGroupService groupService;
+    XmGroupService groupService;
 
 	@Autowired
 	XmMenuController xmMenuController;
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java
index fc14c867..422ca7a6 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java
@@ -12,10 +12,9 @@ import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.xm.core.PubTool;
 import com.xm.core.entity.XmMenu;
-import com.xm.core.entity.XmProjectPhase;
 import com.xm.core.entity.XmTask;
 import com.xm.core.service.XmMenuService;
-import com.xm.core.service.XmProjectGroupService;
+import com.xm.core.service.XmGroupService;
 import com.xm.core.service.XmRecordService;
 import com.xm.core.service.XmTaskService;
 import com.xm.core.vo.XmMenuVo;
@@ -61,7 +60,7 @@ public class XmMenuController {
 	private XmRecordService xmRecordService;
 
 	@Autowired
-	private XmProjectGroupService groupService;
+	private XmGroupService groupService;
 	
 	@ApiOperation( value = "查询项目菜单表信息列表",notes="listXmMenu,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
 	@ApiImplicitParams({  
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmPhaseMenuController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmPhaseMenuController.java
index 549aaf35..35776cc6 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmPhaseMenuController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmPhaseMenuController.java
@@ -3,19 +3,13 @@ package com.xm.core.ctrl;
 import com.mdp.core.entity.Tips;
 import com.mdp.core.err.BizException;
 import com.mdp.core.utils.ResponseHelper;
-import com.mdp.safe.client.entity.User;
-import com.mdp.safe.client.utils.LoginUtils;
 import com.xm.core.entity.XmMenu;
-import com.xm.core.entity.XmProduct;
-import com.xm.core.entity.XmProjectGroup;
 import com.xm.core.service.XmMenuService;
 import com.xm.core.service.XmProductService;
-import com.xm.core.service.XmProjectGroupService;
+import com.xm.core.service.XmGroupService;
 import com.xm.core.service.XmRecordService;
 import com.xm.core.service.push.XmMenuPushMsgService;
 import com.xm.core.vo.XmPhaseMenusVo;
-import com.xm.core.vo.XmPhaseMenusVo;
-import com.xm.core.vo.XmProjectGroupVo;
 import io.swagger.annotations.*;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -59,7 +53,7 @@ public class XmPhaseMenuController {
 	XmMenuController xmMenuController;
 
 	@Autowired
-	XmProjectGroupService groupService;
+    XmGroupService groupService;
 
 
 	@Autowired
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java
index a91349ea..9e73fd19 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java
@@ -11,10 +11,8 @@ import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.xm.core.entity.XmProduct;
 import com.xm.core.entity.XmProductCopyVo;
-import com.xm.core.entity.XmProject;
 import com.xm.core.service.XmProductService;
-import com.xm.core.service.XmProjectGroupService;
-import com.xm.core.service.XmProjectService;
+import com.xm.core.service.XmGroupService;
 import com.xm.core.service.XmRecordService;
 import io.swagger.annotations.*;
 import org.apache.commons.logging.Log;
@@ -25,7 +23,6 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * url编制采用rest风格,如对XM.xm_product 产品表的操作有增删改查,对应的url分别为:<br>
@@ -49,7 +46,7 @@ public class XmProductController {
 	private XmProductService xmProductService;
 
 	@Autowired
-	private XmProjectGroupService groupService;
+	private XmGroupService groupService;
 
 
 	@Autowired
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProductPhaseController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProductPhaseController.java
index c232e7f6..7b98be14 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmProductPhaseController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProductPhaseController.java
@@ -12,11 +12,9 @@ import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.xm.core.PubTool;
 import com.xm.core.entity.XmProduct;
-import com.xm.core.entity.XmProject;
 import com.xm.core.entity.XmProjectPhase;
 import com.xm.core.service.*;
 import com.xm.core.vo.XmProjectGroupVo;
-import com.xm.core.vo.XmProjectPhaseVo;
 import io.swagger.annotations.*;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -52,7 +50,7 @@ public class XmProductPhaseController {
 	private XmProjectPhaseService xmProjectPhaseService;
 
 	@Autowired
-	private XmProjectGroupService groupService;
+	private XmGroupService groupService;
 
 	@Autowired
 	private XmProductService xmProductService;
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java
index cca462e0..4ced6696 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java
@@ -12,8 +12,6 @@ import com.mdp.qx.HasQx;
 import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.xm.core.entity.XmProject;
-import com.xm.core.entity.XmProjectPhase;
-import com.xm.core.entity.XmTask;
 import com.xm.core.service.*;
 import com.xm.core.vo.XmProjectCopyVo;
 import com.xm.core.vo.XmProjectGroupVo;
@@ -21,14 +19,12 @@ import com.xm.core.vo.XmProjectVo;
 import io.swagger.annotations.*;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * url编制采用rest风格,如对XM.xm_project xm_project的操作有增删改查,对应的url分别为:<br>
@@ -51,7 +47,7 @@ public class XmProjectController {
 	@Autowired
 	private XmProjectService xmProjectService;
 	@Autowired
-	private XmProjectGroupService groupService;
+	private XmGroupService groupService;
 
 
 	@Autowired
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupFormworkController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupFormworkController.java
deleted file mode 100644
index 610d2114..00000000
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupFormworkController.java
+++ /dev/null
@@ -1,174 +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.XmProjectGroupFormwork;
-import com.xm.core.service.XmProjectGroupFormworkService;
-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_group_formwork xm_project_group_formwork的操作有增删改查,对应的url分别为:<br>
- *  新增: xm/xmProjectGroupFormwork/add <br>
- *  查询: xm/xmProjectGroupFormwork/list<br>
- *  模糊查询: xm/xmProjectGroupFormwork/listKey<br>
- *  修改: xm/xmProjectGroupFormwork/edit <br>
- *  删除: xm/xmProjectGroupFormwork/del<br>
- *  批量删除: xm/xmProjectGroupFormwork/batchDel<br>
- * 组织 com.qqkj  顶级模块 oa 大模块 xm 小模块 <br>
- * 实体 XmProjectGroupFormwork 表 XM.xm_project_group_formwork 当前主键(包括多主键): id; 
- ***/
-@RestController("xm.core.xmProjectGroupFormworkController")
-@RequestMapping(value="/**/xm/core/xmProjectGroupFormwork")
-@Api(tags={"xm_project_group_formwork操作接口"})
-public class XmProjectGroupFormworkController {
-	
-	static Log logger=LogFactory.getLog(XmProjectGroupFormworkController.class);
-	
-	@Autowired
-	private XmProjectGroupFormworkService xmProjectGroupFormworkService;
-	 
-		
- 
-	
-	@ApiOperation( value = "查询xm_project_group_formwork信息列表",notes="listXmProjectGroupFormwork,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
-	@ApiImplicitParams({  
-		@ApiImplicitParam(name="id",value="主键,主键",required=false),
-		@ApiImplicitParam(name="branchId",value="机构编号",required=false),
-		@ApiImplicitParam(name="groupName",value="团队名称",required=false),
-		@ApiImplicitParam(name="isPub",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= XmProjectGroupFormwork.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
-	})
-	@RequestMapping(value="/list",method=RequestMethod.GET)
-	public Map<String,Object> listXmProjectGroupFormwork( @RequestParam Map<String,Object> xmProjectGroupFormwork){
-		Map<String,Object> m = new HashMap<>(); 
-		RequestUtils.transformArray(xmProjectGroupFormwork, "ids");
-		PageUtils.startPage(xmProjectGroupFormwork);
-		List<Map<String,Object>>	xmProjectGroupFormworkList = xmProjectGroupFormworkService.getAllGroupName(xmProjectGroupFormwork);	//列出XmProjectGroupFormwork列表
-		PageUtils.responePage(m, xmProjectGroupFormworkList);
-		m.put("data",xmProjectGroupFormworkList);
-		Tips tips=new Tips("查询成功");
-		m.put("tips", tips);
-		return m;
-	}
-	
-
-	@ApiOperation( value = "新增一条xm_project_group_formwork信息",notes="addXmProjectGroupFormwork,主键如果为空，后台自动生成")
-	@ApiResponses({
-		@ApiResponse(code = 200,response=XmProjectGroupFormwork.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
-	}) 
-	@RequestMapping(value="/add",method=RequestMethod.POST)
-	public Map<String,Object> addXmProjectGroupFormwork(@RequestBody XmProjectGroupFormwork xmProjectGroupFormwork) {
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功新增一条数据");
-		try{
-			if(StringUtils.isEmpty(xmProjectGroupFormwork.getId())) {
-				xmProjectGroupFormwork.setId(xmProjectGroupFormworkService.createKey("id"));
-			}else{
-				 XmProjectGroupFormwork xmProjectGroupFormworkQuery = new  XmProjectGroupFormwork(xmProjectGroupFormwork.getId());
-				if(xmProjectGroupFormworkService.countByWhere(xmProjectGroupFormworkQuery)>0){
-					tips.setFailureMsg("编号重复，请修改编号再提交");
-					m.put("tips", tips);
-					return m;
-				}
-			}
-			xmProjectGroupFormworkService.insert(xmProjectGroupFormwork);
-			m.put("data",xmProjectGroupFormwork);
-		}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_group_formwork信息",notes="delXmProjectGroupFormwork,仅需要上传主键字段")
-	@ApiResponses({
-		@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}")
-	}) 
-	@RequestMapping(value="/del",method=RequestMethod.POST)
-	public Map<String,Object> delXmProjectGroupFormwork(@RequestBody XmProjectGroupFormwork xmProjectGroupFormwork){
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功删除一条数据");
-		try{
-			xmProjectGroupFormworkService.deleteByPk(xmProjectGroupFormwork);
-		}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_group_formwork信息",notes="editXmProjectGroupFormwork")
-	@ApiResponses({
-		@ApiResponse(code = 200,response=XmProjectGroupFormwork.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
-	}) 
-	@RequestMapping(value="/edit",method=RequestMethod.POST)
-	public Map<String,Object> editXmProjectGroupFormwork(@RequestBody XmProjectGroupFormwork xmProjectGroupFormwork) {
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功更新一条数据");
-		try{
-			xmProjectGroupFormworkService.updateByPk(xmProjectGroupFormwork);
-			m.put("data",xmProjectGroupFormwork);
-		}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_group_formwork信息",notes="batchDelXmProjectGroupFormwork,仅需要上传主键字段")
-	@ApiResponses({
-		@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}")
-	}) 
-	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
-	public Map<String,Object> batchDelXmProjectGroupFormwork(@RequestBody List<XmProjectGroupFormwork> xmProjectGroupFormworks) {
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功删除"+xmProjectGroupFormworks.size()+"条数据"); 
-		try{ 
-			xmProjectGroupFormworkService.batchDelete(xmProjectGroupFormworks);
-		}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/ctrl/XmProjectPhaseController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java
index 564ae045..fe939f4d 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java
@@ -15,7 +15,6 @@ import com.xm.core.entity.XmProject;
 import com.xm.core.entity.XmProjectPhase;
 import com.xm.core.service.*;
 import com.xm.core.vo.XmProjectGroupVo;
-import com.xm.core.vo.XmProjectPhaseVo;
 import io.swagger.annotations.*;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -51,7 +50,7 @@ public class XmProjectPhaseController {
 	private XmProjectPhaseService xmProjectPhaseService;
 
 	@Autowired
-	private XmProjectGroupService groupService;
+	private XmGroupService groupService;
 
 	@Autowired
 	private XmProjectService xmProjectService;
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
index 21b9980f..f95fcb7c 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
@@ -60,7 +60,7 @@ public class XmTaskController {
 	private XmTaskService xmTaskService;
 	
 	@Autowired
-    XmProjectGroupService groupService;
+	XmGroupService groupService;
 	
 	@Autowired
 	private XmRecordService xmRecordService;
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java
index 295eb97e..d5e87c70 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java
@@ -13,8 +13,8 @@ import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.xm.core.entity.XmTask;
 import com.xm.core.entity.XmTaskExecuser;
-import com.xm.core.service.XmProjectGroupService;
-import com.xm.core.service.XmProjectGroupUserService;
+import com.xm.core.service.XmGroupService;
+import com.xm.core.service.XmGroupUserService;
 import com.xm.core.service.XmTaskExecuserService;
 import com.xm.core.service.XmTaskService;
 import com.xm.core.vo.XmProjectGroupVo;
@@ -55,14 +55,14 @@ public class XmTaskExecuserController {
 	private XmTaskService xmTaskService;
 	 
 	@Autowired
-    XmProjectGroupUserService xmProjectGroupUserService;
+	XmGroupUserService xmProjectGroupUserService;
 
 	@Autowired
 	ItemService itemService;
 	
 
 	@Autowired
-    XmProjectGroupService groupService;
+    XmGroupService groupService;
 	
 	@ApiOperation( value = "查询xm_task_execuser信息列表",notes="listXmTaskExecuser,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
 	@ApiImplicitParams({  
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectGroup.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectGroup.java
index 7e141318..34f3cfa9 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmProjectGroup.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectGroup.java
@@ -8,12 +8,12 @@ import java.util.Date;
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmProjectGroup所有属性名: <br>
  *	id,groupName,projectId,pgTypeId,pgTypeName,leaderUserid,leaderUsername,ctime,ltime,productId,branchId,pgClass,pgroupId,lvl,pidPaths,isTpl,assUserid,assUsername,childrenCnt,userCnt,qxCode,calcWorkload,ntype,crowBranchId,crowBranchName,isCrow;<br>
- * 表 xm_project_group xm_project_group的所有字段名: <br>
+ * 表 xm_group xm_group的所有字段名: <br>
  *	id,group_name,project_id,pg_type_id,pg_type_name,leader_userid,leader_username,ctime,ltime,product_id,branch_id,pg_class,pgroup_id,lvl,pid_paths,is_tpl,ass_userid,ass_username,children_cnt,user_cnt,qx_code,calc_workload,ntype,crow_branch_id,crow_branch_name,is_crow;<br>
  * 当前主键(包括多主键):<br>
  *	id;<br>
  */
-@ApiModel(description="xm_project_group")
+@ApiModel(description="xm_group")
 public class XmProjectGroup  implements java.io.Serializable {
 	
 	private static final long serialVersionUID = 1L;
@@ -102,7 +102,7 @@ public class XmProjectGroup  implements java.io.Serializable {
 		this.id = id;
 	}
     
-    /**xm_project_group**/
+    /**xm_group**/
 	public XmProjectGroup() {
 	}
 	
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupFormwork.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupFormwork.java
index 2e85d76a..24c1ebee 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupFormwork.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupFormwork.java
@@ -7,12 +7,12 @@ import io.swagger.annotations.ApiModelProperty;
  * 组织 com.qqkj  顶级模块 oa 大模块 xm  小模块 <br> 
  * 实体 XmProjectGroupFormwork所有属性名: <br>
  *	id,branchId,groupName,isPub,pgTypeId,pgTypeName;<br>
- * 表 XM.xm_project_group_formwork xm_project_group_formwork的所有字段名: <br>
+ * 表 XM.xm_group_formwork xm_group_formwork的所有字段名: <br>
  *	id,branch_id,group_name,is_pub,pg_type_id,pg_type_name;<br>
  * 当前主键(包括多主键):<br>
  *	id;<br>
  */
-@ApiModel(description="xm_project_group_formwork")
+@ApiModel(description="xm_group_formwork")
 public class XmProjectGroupFormwork  implements java.io.Serializable {
 	
 	private static final long serialVersionUID = 1L;
@@ -41,7 +41,7 @@ public class XmProjectGroupFormwork  implements java.io.Serializable {
 		this.id = id;
 	}
     
-    /**xm_project_group_formwork**/
+    /**xm_group_formwork**/
 	public XmProjectGroupFormwork() {
 	}
 	
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupState.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupState.java
index 81c3f6a8..5a52e317 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupState.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupState.java
@@ -9,7 +9,7 @@ import java.math.BigDecimal;
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmProjectGroupState所有属性名: <br>
  *	planStartTime,planEndTime,actStartTime,actEndTime,planWorkload,actWorkload,planCostAmount,actCostAmount,finishRate,demandRate,designRate,devRate,uatRate,sitRate,ctime,calcTime,planWorkhours,planWorkerCnt,closedBugs,activeBugs,confirmedBugs,resolvedBugs,testCases,execCases,designCases,finishCases,iterationCnt,taskCnt,finishTaskCnt,bizDate,bugCnt,groupId,projectId,projectName,groupName;<br>
- * 表 xm_project_group_state 功能状态表,无需前端维护，所有数据由汇总统计得出的所有字段名: <br>
+ * 表 xm_group_state 功能状态表,无需前端维护，所有数据由汇总统计得出的所有字段名: <br>
  *	plan_start_time,plan_end_time,act_start_time,act_end_time,plan_workload,act_workload,plan_cost_amount,act_cost_amount,finish_rate,demand_rate,design_rate,dev_rate,uat_rate,sit_rate,ctime,calc_time,plan_workhours,plan_worker_cnt,closed_bugs,active_bugs,confirmed_bugs,resolved_bugs,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,task_cnt,finish_task_cnt,biz_date,bug_cnt,group_id,project_id,project_name,group_name;<br>
  * 当前主键(包括多主键):<br>
  *	group_id;<br>
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupUser.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupUser.java
index 471748ba..1beea609 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupUser.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupUser.java
@@ -8,12 +8,12 @@ import java.util.Date;
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmProjectGroupUser所有属性名: <br>
  *	joinTime,groupId,userid,username,outTime,status,obranchId,isPri,seqNo,projectId,productId,pgClass,obranchName;<br>
- * 表 xm_project_group_user xm_project_group_user的所有字段名: <br>
+ * 表 xm_group_user xm_group_user的所有字段名: <br>
  *	join_time,group_id,userid,username,out_time,status,obranch_id,is_pri,seq_no,project_id,product_id,pg_class,obranch_name;<br>
  * 当前主键(包括多主键):<br>
  *	group_id,userid;<br>
  */
-@ApiModel(description="xm_project_group_user")
+@ApiModel(description="xm_group_user")
 public class XmProjectGroupUser  implements java.io.Serializable {
 	
 	private static final long serialVersionUID = 1L;
@@ -64,7 +64,7 @@ public class XmProjectGroupUser  implements java.io.Serializable {
 		this.userid = userid;
 	}
     
-    /**xm_project_group_user**/
+    /**xm_group_user**/
 	public XmProjectGroupUser() {
 	}
 	
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectGroupService.java b/xm-core/src/main/java/com/xm/core/service/XmGroupService.java
similarity index 99%
rename from xm-core/src/main/java/com/xm/core/service/XmProjectGroupService.java
rename to xm-core/src/main/java/com/xm/core/service/XmGroupService.java
index 2053e6cf..157bb69c 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmProjectGroupService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmGroupService.java
@@ -21,20 +21,20 @@ import java.util.stream.Collectors;
 /**
  * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
  * 组织 com.qqkj  顶级模块 oa 大模块 xm 小模块 <br>
- * 实体 XmProjectGroup 表 XM.xm_project_group 当前主键(包括多主键): id; 
+ * 实体 XmProjectGroup 表 XM.xm_group 当前主键(包括多主键): id; 
  ***/
-@Service("xm.core.xmProjectGroupService")
-public class XmProjectGroupService extends BaseService {
+@Service("xm.core.xmGroupService")
+public class XmGroupService extends BaseService {
 
 
 	@Autowired
 	XmRecordService xmRecordService;
 	
     @Autowired
-    XmProjectGroupService xmProjectGroupService;
+	XmGroupService xmProjectGroupService;
 
     @Autowired
-    XmProjectGroupUserService xmProjectGroupUserService;
+	XmGroupUserService xmProjectGroupUserService;
     
     @Autowired
     XmProjectGroupCacheService groupCacheService;
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectGroupStateService.java b/xm-core/src/main/java/com/xm/core/service/XmGroupStateService.java
similarity index 73%
rename from xm-core/src/main/java/com/xm/core/service/XmProjectGroupStateService.java
rename to xm-core/src/main/java/com/xm/core/service/XmGroupStateService.java
index 05d10265..0205c6c0 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmProjectGroupStateService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmGroupStateService.java
@@ -6,10 +6,10 @@ import org.springframework.stereotype.Service;
 /**
  * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
  * 组织 com.qqkj  顶级模块 xm 大模块 core 小模块 <br>
- * 实体 XmProjectGroupState 表 XM.xm_project_group_state 当前主键(包括多主键): id; 
+ * 实体 XmProjectGroupState 表 XM.xm_group_state 当前主键(包括多主键): id; 
  ***/
-@Service("xm.core.xmProjectGroupStateService")
-public class XmProjectGroupStateService extends BaseService {
+@Service("xm.core.xmGroupStateService")
+public class XmGroupStateService extends BaseService {
 	
 	/**
 	 * 计算bug、task、测试案例、等数据
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectGroupUserService.java b/xm-core/src/main/java/com/xm/core/service/XmGroupUserService.java
similarity index 82%
rename from xm-core/src/main/java/com/xm/core/service/XmProjectGroupUserService.java
rename to xm-core/src/main/java/com/xm/core/service/XmGroupUserService.java
index 1379f789..7163a3d6 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmProjectGroupUserService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmGroupUserService.java
@@ -9,10 +9,10 @@ import java.util.List;
 /**
  * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
  * 组织 com.qqkj  顶级模块 oa 大模块 xm 小模块 <br>
- * 实体 XmProjectGroupUser 表 XM.xm_project_group_user 当前主键(包括多主键): id; 
+ * 实体 XmProjectGroupUser 表 XM.xm_group_user 当前主键(包括多主键): id; 
  ***/
-@Service("xm.core.xmProjectGroupUserService")
-public class XmProjectGroupUserService extends BaseService {
+@Service("xm.core.xmGroupUserService")
+public class XmGroupUserService extends BaseService {
 
 
 	@Autowired
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProductService.java b/xm-core/src/main/java/com/xm/core/service/XmProductService.java
index 620a0ebe..59d3fbf7 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmProductService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmProductService.java
@@ -38,10 +38,10 @@ public class XmProductService extends BaseService {
 
 
 	@Autowired
-	XmProjectGroupService groupService;
+    XmGroupService groupService;
 
 	@Autowired
-	XmProjectGroupUserService groupUserService;
+	XmGroupUserService groupUserService;
 
 
 	@Autowired
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectGroupFormworkService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectGroupFormworkService.java
deleted file mode 100644
index de44ed0f..00000000
--- a/xm-core/src/main/java/com/xm/core/service/XmProjectGroupFormworkService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.xm.core.service;
-
-import com.mdp.core.service.BaseService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
- * 组织 com.qqkj  顶级模块 oa 大模块 xm 小模块 <br>
- * 实体 XmProjectGroupFormwork 表 XM.xm_project_group_formwork 当前主键(包括多主键): id; 
- ***/
-@Service("xm.core.xmProjectGroupFormworkService")
-public class XmProjectGroupFormworkService extends BaseService {
-
-
-	@Autowired
-	XmRecordService xmRecordService;
-	
-    public List<Map<String, Object>> getAllGroupName(Map<String, Object> map) {
-        return this.getDao().selectList(this.statement("selectAllGroupFormWork"), map);
-    }
-	/** 请在此类添加自定义函数 */
-
-}
-
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java
index 8eb156c3..43968077 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java
@@ -6,11 +6,7 @@ import com.mdp.core.utils.NumberUtil;
 import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.xm.core.entity.XmProjectPhase;
-import com.xm.core.entity.XmProjectPhase;
-import com.xm.core.entity.XmTask;
 import com.xm.core.vo.XmProjectGroupVo;
-import com.xm.core.vo.XmProjectPhaseVo;
-import org.apache.poi.sl.usermodel.FreeformShape;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -34,7 +30,7 @@ public class XmProjectPhaseService extends BaseService {
 	XmRecordService xmRecordService;
 
 	@Autowired
-	XmProjectGroupService groupService;
+    XmGroupService groupService;
 	/**
 	 * 查询项目及计划总预算，用于判断是否超出预算 
 	 */
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 bd45a2e4..78e01a0f 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
@@ -60,10 +60,10 @@ public class XmProjectService extends BaseService {
 	XmProjectPhaseService xmProjectPhaseService;
 
 	@Autowired
-	XmProjectGroupService groupService;
+    XmGroupService groupService;
 
 	@Autowired
-	XmProjectGroupUserService groupUserService;
+	XmGroupUserService groupUserService;
     
     
     public XmProject getProjectFromCache(String projectId) {
diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java
index d2ceff7a..78aca404 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java
@@ -39,7 +39,7 @@ public class XmTaskExecuserService extends BaseService {
 	XmTaskService xmTaskService;
 	
 	@Autowired
-	XmProjectGroupService groupService;
+    XmGroupService groupService;
 	
 	
 	@Autowired
diff --git a/xm-core/src/main/java/com/xm/core/service/cache/XmProjectGroupCacheService.java b/xm-core/src/main/java/com/xm/core/service/cache/XmProjectGroupCacheService.java
index 023ab6c6..13f5c806 100644
--- a/xm-core/src/main/java/com/xm/core/service/cache/XmProjectGroupCacheService.java
+++ b/xm-core/src/main/java/com/xm/core/service/cache/XmProjectGroupCacheService.java
@@ -43,7 +43,7 @@ public class XmProjectGroupCacheService {
 		}
 	}
 	String getCacheKey() {
- 		return "xm_project_group";
+ 		return "xm_group";
 	}
 
 	public  List<XmProjectGroupVo>  getProjectGroups(String projectId){
diff --git a/xm-core/src/main/java/com/xm/core/vo/XmProjectGroupVo.java b/xm-core/src/main/java/com/xm/core/vo/XmProjectGroupVo.java
index c7a84983..fd05af13 100644
--- a/xm-core/src/main/java/com/xm/core/vo/XmProjectGroupVo.java
+++ b/xm-core/src/main/java/com/xm/core/vo/XmProjectGroupVo.java
@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModel;
 
 import java.util.List;
 
-@ApiModel(description="xm_project_group")
+@ApiModel(description="xm_group")
 public class XmProjectGroupVo extends XmProjectGroup {
 	List<XmProjectGroupUser> groupUsers;
 
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmGroupMapper.xml
similarity index 94%
rename from xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupMapper.xml
rename to xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmGroupMapper.xml
index acf78546..fe1de7ed 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmGroupMapper.xml
@@ -13,13 +13,13 @@
         <if test="groupNameKey != null and groupNameKey !='' ">    and res.group_name like concat('%',#{groupNameKey},'%')   </if>
 		<if test="mngUsernamekey != null and mngUsernamekey !='' ">    and (res.leader_username like concat('%',#{mngUsernamekey},'%') or res.ass_username  like concat('%',#{mngUsernamekey},'%'))  </if>
 		<if test="groupUsernameKey != null and groupUsernameKey !='' ">    and
-			exists ( select 1 from xm_project_group_user gu where gu.group_id=res.id and  gu.username like concat('%',#{groupUsernameKey},'%'))
+			exists ( select 1 from xm_group_user gu where gu.group_id=res.id and  gu.username like concat('%',#{groupUsernameKey},'%'))
 		</if>
 		<if test="orCrowBranchId!=null and orCrowBranchId!=''"> and (res.branch_id=#{branchId} or res.crow_branch_id=#{orCrowBranchId})</if>
 		<if test="iterationId!=null and iterationId!=''"> and exists ( select 1 from xm_iteration_product_link ipl left join xm_product_project_link ppl on ipl.product_id=ppl.product_id and (ipl.product_id=res.product_id or ppl.project_id = res.project_id))</if>
     </sql>
 	<delete id="deleteByProjectId" parameterType="com.xm.core.entity.XmProjectGroup">
-		delete from xm_project_group where project_id = #{projectId}
+		delete from xm_group where project_id = #{projectId}
 	</delete>
 
 
@@ -29,7 +29,7 @@
 	
 	<!-- 通过条件查询获取数据列表 返回list<map> -->
 	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
-		select * from xm_project_group res
+		select * from xm_group res
 		<where>
 		    <include refid="whereForMap"/>
 			<include refid="where"/>
@@ -38,7 +38,7 @@
 	
 	<!-- 通过条件查询获取数据列表 不分页 返回 list<Object> -->
 	<select id="selectListByWhere" parameterType="com.xm.core.entity.XmProjectGroup" resultType="com.xm.core.entity.XmProjectGroup">
-		select * from xm_project_group res
+		select * from xm_group res
 		<where>
 			<include refid="where"/>
 		</where>
@@ -46,27 +46,27 @@
 	
 		<!-- 通过主键查询获取数据对象 返回object -->
 	<select id="selectOneObject" parameterType="com.xm.core.entity.XmProjectGroup" resultType="com.xm.core.entity.XmProjectGroup">
-		select * from xm_project_group res
+		select * from xm_group res
 		where 
 			res.id = #{id}
 	</select>
 	
 	<!-- 通过主键查询获取数据对象 返回map-->
 	<select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
-		select * from xm_project_group res
+		select * from xm_group res
 		where 
 			 res.id = #{id}
 	</select>
 	<!-- 获取数据条目 返回long -->
 	<select id="countByWhere" parameterType="com.xm.core.entity.XmProjectGroup" resultType="long">
-		select count(1) from xm_project_group res
+		select count(1) from xm_group res
 		<where>
 			<include refid="where"/>
 		</where>
 	</select>
 	<!-- 新增一条记录  主键id,-->
 	<insert id="insert" parameterType="com.xm.core.entity.XmProjectGroup" useGeneratedKeys="false"   keyProperty="id">
-		insert into xm_project_group(
+		insert into xm_group(
 			<include refid="columns"/>
 		) values (
 		#{id},#{groupName},#{projectId},#{pgTypeId},#{pgTypeName},#{leaderUserid},#{leaderUsername},#{ctime},#{ltime},#{productId},#{branchId},#{pgClass},#{pgroupId},#{lvl},#{pidPaths},#{isTpl},#{assUserid},#{assUsername},#{childrenCnt},#{userCnt},#{qxCode},#{calcWorkload},#{ntype},#{crowBranchId},#{crowBranchName},#{isCrow}
@@ -75,7 +75,7 @@
 	
 	<!-- 按条件删除若干条记录-->
 	<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmProjectGroup">
-		delete from xm_project_group res
+		delete from xm_group res
 		<where>  
 			<include refid="where"/>
 		</where>
@@ -83,13 +83,13 @@
 	
 	<!-- 按主键删除一条记录-->
 	<delete id="deleteByPk" parameterType="com.xm.core.entity.XmProjectGroup">
-		delete from xm_project_group 
+		delete from xm_group
 		where id = #{id} 
 	</delete>
 	
 	<!-- 根据条件修改若干条记录 -->
 	<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmProjectGroup">
-		update  xm_project_group 
+		update  xm_group
 		<set>
 			<include refid="someFieldSet"/>
 		</set>
@@ -98,7 +98,7 @@
 	
 		<!-- 根据主键修改一条记录 -->
 	<update id="updateByPk" parameterType="com.xm.core.entity.XmProjectGroup">
-		update  xm_project_group 
+		update  xm_group
 		<set>
 			<include refid="set"/>
 		</set>
@@ -113,7 +113,7 @@
 	<!-- 批量更新 -->
 	<update id="batchUpdate" parameterType="List">   
 		<foreach collection="list" item="item" index="index" separator=";" >
-   		update  xm_project_group 
+   		update  xm_group
 		set 
 			<include refid="batchSet"/>
 			where id = #{item.id}  
@@ -121,7 +121,7 @@
 	</update>
 	<!-- 批量删除 -->
 	<delete id="batchDelete" parameterType="List">  
-		delete from xm_project_group 
+		delete from xm_group
 			where
 			(id) in
                 <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupStateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmGroupStateMapper.xml
similarity index 96%
rename from xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupStateMapper.xml
rename to xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmGroupStateMapper.xml
index 0518993c..8499b76d 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupStateMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmGroupStateMapper.xml
@@ -14,7 +14,7 @@
         <if test="key != null and key !='' ">       </if>
     </sql>
 	<update id="loadTasksToXmProjectGroupState" parameterType="String" statementType="CALLABLE">
-		{call load_tasks_to_xm_project_group_state(#{projectId,mode=IN})}
+		{call load_tasks_to_xm_group_state(#{projectId,mode=IN})}
 	</update>
 
 
@@ -24,7 +24,7 @@
 	
 	<!-- 通过条件查询获取数据列表 返回list<map> -->
 	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
-		select * from xm_project_group_state res
+		select * from xm_group_state res
 		<where>
 		    <include refid="whereForMap"/>
 			<include refid="where"/>
@@ -33,7 +33,7 @@
 	
 	<!-- 通过条件查询获取数据列表 不分页 返回 list<Object> -->
 	<select id="selectListByWhere" parameterType="com.xm.core.entity.XmProjectGroupState" resultType="com.xm.core.entity.XmProjectGroupState">
-		select * from xm_project_group_state res
+		select * from xm_group_state res
 		<where>
 			<include refid="where"/>
 		</where>
@@ -41,27 +41,27 @@
 	
 		<!-- 通过主键查询获取数据对象 返回object -->
 	<select id="selectOneObject" parameterType="com.xm.core.entity.XmProjectGroupState" resultType="com.xm.core.entity.XmProjectGroupState">
-		select * from xm_project_group_state res
+		select * from xm_group_state res
 		where 
 			res.group_id = #{groupId}
 	</select>
 	
 	<!-- 通过主键查询获取数据对象 返回map-->
 	<select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
-		select * from xm_project_group_state res
+		select * from xm_group_state res
 		where 
 			 res.group_id = #{groupId}
 	</select>
 	<!-- 获取数据条目 返回long -->
 	<select id="countByWhere" parameterType="com.xm.core.entity.XmProjectGroupState" resultType="long">
-		select count(1) from xm_project_group_state res
+		select count(1) from xm_group_state res
 		<where>
 			<include refid="where"/>
 		</where>
 	</select>
 	<!-- 新增一条记录  主键group_id,-->
 	<insert id="insert" parameterType="com.xm.core.entity.XmProjectGroupState" useGeneratedKeys="false"   keyProperty="group_id">
-		insert into xm_project_group_state(
+		insert into xm_group_state(
 			<include refid="columns"/>
 		) values (
 		#{planStartTime},#{planEndTime},#{actStartTime},#{actEndTime},#{planWorkload},#{actWorkload},#{planCostAmount},#{actCostAmount},#{finishRate},#{demandRate},#{designRate},#{devRate},#{uatRate},#{sitRate},#{ctime},#{calcTime},#{planWorkhours},#{planWorkerCnt},#{closedBugs},#{activeBugs},#{confirmedBugs},#{resolvedBugs},#{testCases},#{execCases},#{designCases},#{finishCases},#{iterationCnt},#{taskCnt},#{finishTaskCnt},#{bizDate},#{bugCnt},#{groupId},#{projectId},#{projectName},#{groupName}
@@ -70,7 +70,7 @@
 	
 	<!-- 按条件删除若干条记录-->
 	<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmProjectGroupState">
-		delete from xm_project_group_state res
+		delete from xm_group_state res
 		<where>  
 			<include refid="where"/>
 		</where>
@@ -78,13 +78,13 @@
 	
 	<!-- 按主键删除一条记录-->
 	<delete id="deleteByPk" parameterType="com.xm.core.entity.XmProjectGroupState">
-		delete from xm_project_group_state 
+		delete from xm_group_state
 		where group_id = #{groupId} 
 	</delete>
 	
 	<!-- 根据条件修改若干条记录 -->
 	<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmProjectGroupState">
-		update  xm_project_group_state 
+		update  xm_group_state
 		<set>
 			<include refid="someFieldSet"/>
 		</set>
@@ -93,7 +93,7 @@
 	
 		<!-- 根据主键修改一条记录 -->
 	<update id="updateByPk" parameterType="com.xm.core.entity.XmProjectGroupState">
-		update  xm_project_group_state 
+		update  xm_group_state
 		<set>
 			<include refid="set"/>
 		</set>
@@ -108,7 +108,7 @@
 	<!-- 批量更新 -->
 	<update id="batchUpdate" parameterType="List">   
 		<foreach collection="list" item="item" index="index" separator=";" >
-   		update  xm_project_group_state 
+   		update  xm_group_state
 		set 
 			<include refid="batchSet"/>
 			where group_id = #{item.groupId}  
@@ -116,7 +116,7 @@
 	</update>
 	<!-- 批量删除 -->
 	<delete id="batchDelete" parameterType="List">  
-		delete from xm_project_group_state 
+		delete from xm_group_state
 			where
 			(group_id) in
                 <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupUserMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmGroupUserMapper.xml
similarity index 89%
rename from xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupUserMapper.xml
rename to xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmGroupUserMapper.xml
index ee275209..329fe851 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupUserMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmGroupUserMapper.xml
@@ -17,25 +17,25 @@
 		<if test="groupUsernameKey != null and groupUsernameKey !='' ">    and res.username like concat('%',#{groupUsernameKey},'%') </if>
     </sql>
 	<delete id="deleteByGroupId" parameterType="com.xm.core.entity.XmProjectGroupUser">
-		delete from xm_project_group_user where group_id = #{groupId}
+		delete from xm_group_user where group_id = #{groupId}
 	</delete>
 
 	<!-- 通过条件查询获取数据列表 不分页 返回 list<Object> -->
 	<select id="selectGroupUserListByProjectId" parameterType="String" resultType="com.xm.core.entity.XmProjectGroupUser">
-		select * from xm_project_group_user res
+		select * from xm_group_user res
 		<where>
-			exists( select 1 from xm_project_group g where g.id=res.group_id and g.project_id=#{projectId})
+			exists( select 1 from xm_group g where g.id=res.group_id and g.project_id=#{projectId})
 		</where>
 	</select>
 	<select id="selectGroupUserListByProductId" parameterType="String" resultType="com.xm.core.entity.XmProjectGroupUser">
-		select * from xm_project_group_user res
+		select * from xm_group_user res
 		<where>
-			exists( select 1 from xm_project_group g where g.id=res.group_id and g.product_id=#{productId})
+			exists( select 1 from xm_group g where g.id=res.group_id and g.product_id=#{productId})
 		</where>
 	</select>
 
 	<select id="selectListByIds" parameterType="List" resultType="com.xm.core.entity.XmProjectGroupUser">
-		   select * from xm_project_group_user res where  (res.group_id, res.userid) in
+		   select * from xm_group_user res where  (res.group_id, res.userid) in
 			<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
 				( #{item.groupId},  #{item.userid})
 			</foreach>
@@ -46,7 +46,7 @@
 	
 	<!-- 通过条件查询获取数据列表 返回list<map> -->
 	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
-		select res.*,g.group_name,g.crow_branch_name,g.crow_branch_id,g.is_crow from xm_project_group_user res left join xm_project_group g on res.group_id=g.id
+		select res.*,g.group_name,g.crow_branch_name,g.crow_branch_id,g.is_crow from xm_group_user res left join xm_group g on res.group_id=g.id
 		<where>
 		    <include refid="whereForMap"/>
 			<include refid="where"/>
@@ -56,7 +56,7 @@
 	
 	<!-- 通过条件查询获取数据列表 不分页 返回 list<Object> -->
 	<select id="selectListByWhere" parameterType="com.xm.core.entity.XmProjectGroupUser" resultType="com.xm.core.entity.XmProjectGroupUser">
-		select * from xm_project_group_user res
+		select * from xm_group_user res
 		<where>
 			<include refid="where"/>
 		</where>
@@ -64,7 +64,7 @@
 	
 		<!-- 通过主键查询获取数据对象 返回object -->
 	<select id="selectOneObject" parameterType="com.xm.core.entity.XmProjectGroupUser" resultType="com.xm.core.entity.XmProjectGroupUser">
-		select * from xm_project_group_user res
+		select * from xm_group_user res
 		where 
 			res.group_id = #{groupId}
 			and res.userid = #{userid}
@@ -72,21 +72,21 @@
 	
 	<!-- 通过主键查询获取数据对象 返回map-->
 	<select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
-		select * from xm_project_group_user res
+		select * from xm_group_user res
 		where 
 			 res.group_id = #{groupId}
 			and  res.userid = #{userid}
 	</select>
 	<!-- 获取数据条目 返回long -->
 	<select id="countByWhere" parameterType="com.xm.core.entity.XmProjectGroupUser" resultType="long">
-		select count(1) from xm_project_group_user res
+		select count(1) from xm_group_user res
 		<where>
 			<include refid="where"/>
 		</where>
 	</select>
 	<!-- 新增一条记录  主键group_id,userid,-->
 	<insert id="insert" parameterType="com.xm.core.entity.XmProjectGroupUser" useGeneratedKeys="false"  >
-		insert into xm_project_group_user(
+		insert into xm_group_user(
 			<include refid="columns"/>
 		) values (
 		#{joinTime},#{groupId},#{userid},#{username},#{outTime},#{status},#{obranchId},#{isPri},#{seqNo},#{projectId},#{productId},#{pgClass},#{obranchName}
@@ -95,7 +95,7 @@
 	
 	<!-- 按条件删除若干条记录-->
 	<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmProjectGroupUser">
-		delete from xm_project_group_user res
+		delete from xm_group_user res
 		<where>  
 			<include refid="where"/>
 		</where>
@@ -103,13 +103,13 @@
 	
 	<!-- 按主键删除一条记录-->
 	<delete id="deleteByPk" parameterType="com.xm.core.entity.XmProjectGroupUser">
-		delete from xm_project_group_user 
+		delete from xm_group_user
 		where group_id = #{groupId} and userid = #{userid} 
 	</delete>
 	
 	<!-- 根据条件修改若干条记录 -->
 	<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmProjectGroupUser">
-		update  xm_project_group_user 
+		update  xm_group_user
 		<set>
 			<include refid="someFieldSet"/>
 		</set>
@@ -118,7 +118,7 @@
 	
 		<!-- 根据主键修改一条记录 -->
 	<update id="updateByPk" parameterType="com.xm.core.entity.XmProjectGroupUser">
-		update  xm_project_group_user 
+		update  xm_group_user
 		<set>
 			<include refid="set"/>
 		</set>
@@ -133,7 +133,7 @@
 	<!-- 批量更新 -->
 	<update id="batchUpdate" parameterType="List">   
 		<foreach collection="list" item="item" index="index" separator=";" >
-   		update  xm_project_group_user 
+   		update  xm_group_user
 		set 
 			<include refid="batchSet"/>
 			where group_id = #{item.groupId} and userid = #{item.userid}  
@@ -141,7 +141,7 @@
 	</update>
 	<!-- 批量删除 -->
 	<delete id="batchDelete" parameterType="List">  
-		delete from xm_project_group_user 
+		delete from xm_group_user
 			where
 			(group_id, userid) in
                 <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml
index f2527461..b5e5c15d 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml
@@ -18,7 +18,7 @@
 			)
 		</if>
 		<if test="compete !=null and compete!=''">
-			and ( exists ( select 1 from xm_project_group_user gu inner join xm_task t on gu.project_id=t.project_id and t.product_id=res.id where gu.userid=#{compete} and t.product_id=res.id )
+			and ( exists ( select 1 from xm_group_user gu inner join xm_task t on gu.project_id=t.project_id and t.product_id=res.id where gu.userid=#{compete} and t.product_id=res.id )
 			or res.pm_userid=#{compete}
 			or exists ( select 1 from xm_menu m where m.mm_userid=#{compete} and m.product_id=res.id)
 			)
@@ -48,7 +48,7 @@
 				and exists( select 1 from xm_iteration_product_link ipl where ipl.product_id =res.id and ipl.iteration_id=#{iterationId} )
 			</if>
 			<if test="compete !=null and compete!=''">
-				and ( exists ( select 1 from xm_project_group_user gu inner join xm_task t on gu.project_id=t.project_id and t.product_id=res.id where gu.userid=#{compete} and t.product_id=res.id )
+				and ( exists ( select 1 from xm_group_user gu inner join xm_task t on gu.project_id=t.project_id and t.product_id=res.id where gu.userid=#{compete} and t.product_id=res.id )
 				or res.pm_userid=#{compete}
 				or exists ( select 1 from xm_menu m where m.mm_userid=#{compete} and m.product_id=res.id)
 				)
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupFormworkMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupFormworkMapper.xml
deleted file mode 100644
index 9301db54..00000000
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupFormworkMapper.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xm.core.entity.XmProjectGroupFormwork">
-	
-	
-	<!--开始 自定sql函数区域 -->
-		<!--请在此区域添加自定义函数-->
-	<select id="selectAllGroupFormWork" parameterType="HashMap" resultType="HashMap">
-		select * from xm_project_group_formwork res
-		<where>
-			<if test="branchId != null and branchId != ''">      and res.branch_id = #{branchId}     </if>
-			 or res.is_pub = "1"
-		</where>
-	</select>
-		
-		
-		
-	<!--结束 自定义sql函数区域-->
-	
-
-	
-	<!-- 通过条件查询获取数据列表 返回list<map> -->
-	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
-		select * from xm_project_group_formwork res
-		<where> 
-			<if test="ids != null">  and     
-				id in
-				    <foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >  
-				        #{item}  
-				    </foreach>  
-			 </if>
-			<include refid="where"/>
-			<if test="key != null and key !='' ">       </if> 
-		</where>
-	</select>
-	
-	<!-- 通过条件查询获取数据列表 不分页 返回 list<Object> -->
-	<select id="selectListByWhere" parameterType="com.xm.core.entity.XmProjectGroupFormwork" resultType="com.xm.core.entity.XmProjectGroupFormwork">
-		select * from xm_project_group_formwork res
-		<where>
-			<include refid="where"/>
-		</where>
-	</select>
-	
-		<!-- 通过主键查询获取数据对象 返回object -->
-	<select id="selectOneObject" parameterType="com.xm.core.entity.XmProjectGroupFormwork" resultType="com.xm.core.entity.XmProjectGroupFormwork">
-		select * from xm_project_group_formwork res
-		where 
-			res.id = #{id}
-	</select>
-	
-	<!-- 通过主键查询获取数据对象 返回map-->
-	<select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
-		select * from xm_project_group_formwork res
-		where 
-			 res.id = #{id}
-	</select>
-	<!-- 获取数据条目 返回long -->
-	<select id="countByWhere" parameterType="com.xm.core.entity.XmProjectGroupFormwork" resultType="long">
-		select count(1) from xm_project_group_formwork res
-		<where>
-			<include refid="where"/>
-		</where>
-	</select>
-	<!-- 新增一条记录  主键id,-->
-	<insert id="insert" parameterType="com.xm.core.entity.XmProjectGroupFormwork" useGeneratedKeys="false" keyProperty="id">
-		insert into xm_project_group_formwork(
-			<include refid="columns"/>
-		) values (
-		#{id},#{branchId},#{groupName},#{isPub},#{pgTypeId},#{pgTypeName}
-		)
-	</insert>
-	
-	<!-- 按条件删除若干条记录-->
-	<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmProjectGroupFormwork">
-		delete from xm_project_group_formwork res
-		<where>  
-			<include refid="where"/>
-		</where>
-	</delete>
-	
-	<!-- 按主键删除一条记录-->
-	<delete id="deleteByPk" parameterType="com.xm.core.entity.XmProjectGroupFormwork">
-		delete from xm_project_group_formwork
-		where id = #{id} 
-	</delete>
-	
-	<!-- 根据条件修改若干条记录 -->
-	<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmProjectGroupFormwork">
-		update  xm_project_group_formwork
-		<set>
-			<include refid="someFieldSet"/>
-		</set>
-		where id = #{id} 
-	</update>
-	
-		<!-- 根据主键修改一条记录 -->
-	<update id="updateByPk" parameterType="com.xm.core.entity.XmProjectGroupFormwork">
-		update  xm_project_group_formwork
-		<set>
-			<include refid="set"/>
-		</set>
-		where id = #{id} 
-	</update>
-
-	<!-- 批量新增  批量插入 借用insert 循环插入实现
-	<insert id="batchInsert" parameterType="List">
- 	</insert>
- 	-->
- 	
-	<!-- 批量更新 -->
-	<update id="batchUpdate" parameterType="List">   
-		<foreach collection="list" item="item" index="index" separator=";" >
-   		update  xm_project_group_formwork
-		set 
-			<include refid="batchSet"/>
-			where id = #{item.id}  
-		</foreach> 
-	</update>
-	<!-- 批量删除 -->
-	<delete id="batchDelete" parameterType="List">  
-		delete from xm_project_group_formwork
-			where id in
-			    <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >  
-			        #{item.id }  
-			    </foreach>  
-	</delete>
-	
-	
-	<!--sql片段 列-->
-	<sql id="columns">
-		id,branch_id,group_name,is_pub,pg_type_id,pg_type_name
-	</sql>
-	
-	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
-	<sql id="where">
-		<if test="id != null and id != ''">      and res.id = #{id}     </if>
-		<if test="branchId != null and branchId != ''">      and res.branch_id = #{branchId}     </if>
-		<if test="groupName != null and groupName != ''">      and res.group_name = #{groupName}     </if>
-		<if test="isPub != null and isPub != ''">      and res.is_pub = #{isPub}     </if>
-		<if test="pgTypeId != null and pgTypeId != ''">      and res.pg_type_id = #{pgTypeId}     </if>
-		<if test="pgTypeName != null and pgTypeName != ''">      and res.pg_type_name = #{pgTypeName}     </if>
-	</sql>
-	<!--sql片段 更新字段 -->
-	<sql id="set">
-		branch_id = #{branchId},
-		group_name = #{groupName},
-		is_pub = #{isPub},
-		pg_type_id = #{pgTypeId},
-		pg_type_name = #{pgTypeName}
-	</sql>
-	<sql id="someFieldSet">
-		<if test="branchId != null and branchId != ''"> branch_id = #{branchId},     </if>
-		<if test="groupName != null and groupName != ''"> group_name = #{groupName},     </if>
-		<if test="isPub != null and isPub != ''"> is_pub = #{isPub},     </if>
-		<if test="pgTypeId != null and pgTypeId != ''"> pg_type_id = #{pgTypeId},     </if>
-		<if test="pgTypeName != null and pgTypeName != ''"> pg_type_name = #{pgTypeName},     </if>
-	</sql>
-	<!--sql片段 批量更新 -->
-	<sql id="batchSet">
-			branch_id = #{item.branchId},
-			group_name = #{item.groupName},
-			is_pub = #{item.isPub},
-			pg_type_id = #{item.pgTypeId},
-			pg_type_name = #{item.pgTypeName}
-	</sql>
-</mapper>
\ No newline at end of file
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml
index 478c56d5..171dfc7d 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml
@@ -23,14 +23,14 @@
 		</if>
 		<!-- 我参与的  包括我创建的，我监控的，我审核的-->
 		<if test=" compete !=null and compete !='' ">
-			and (    exists ( select 1 from xm_project_group g,XM.xm_project_group_user gu where gu.group_id=g.id and gu.userid=#{userid} and g.project_id=res.id )
+			and (    exists ( select 1 from xm_group g,XM.xm_group_user gu where gu.group_id=g.id and gu.userid=#{userid} and g.project_id=res.id )
 			or  res.create_userid=#{compete}
 			or  exists ( select 1 from xm_task_execuser exe where exe.project_id=res.id and exe.userid=#{compete} )
 			)
 		</if>
 		<!-- 按参与角色查询等-->
 		<if test="pgTypeIds != null ">
-			and  exists ( select 1 from xm_project_group g,XM.xm_project_group_user gu where gu.group_id=g.id and gu.userid=#{userid} and g.project_id=res.id
+			and  exists ( select 1 from xm_group g,XM.xm_group_user gu where gu.group_id=g.id and gu.userid=#{userid} and g.project_id=res.id
 			and   g.pg_type_id in
 			<foreach collection="pgTypeIds" item="item" index="index" open="(" separator="," close=")" >
 				#{item}
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml
index 28aafd80..4c4931ad 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml
@@ -27,7 +27,7 @@
 			</foreach>
 		</if>
 		<if test="compete !=null and compete!=''">
-			and exists ( select 1 from xm_project_group_user gu where gu.userid=#{compete} and (gu.project_id=res.project_id or gu.product_id=res.product_id))
+			and exists ( select 1 from xm_group_user gu where gu.userid=#{compete} and (gu.project_id=res.project_id or gu.product_id=res.product_id))
 		</if>
 		<if test="key != null and key !='' ">  and res.name like #{key}     </if>
 		<if test="work != null and work != ''"> and res.status != 'resolved' </if>
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml
index 03a95d33..10730fa3 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml
@@ -45,7 +45,7 @@
 			)
 		</if>
 		<if test="compete !=null and compete!=''">
-			and ( exists ( select 1 from xm_project_group_user gu where gu.userid=#{compete} and gu.project_id=res.project_id )
+			and ( exists ( select 1 from xm_group_user gu where gu.userid=#{compete} and gu.project_id=res.project_id )
 			or  exists ( select 1 from xm_task_execuser exe where exe.project_id=res.project_id and exe.userid=#{compete})
 			)
 
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseExecMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseExecMapper.xml
index 6973a992..1aa2ea6c 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseExecMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseExecMapper.xml
@@ -44,7 +44,7 @@
 				</foreach>
 			</if>
 			<if test="compete !=null and compete!=''">
-				and exists ( select 1 from xm_project_group_user gu where gu.userid=#{compete} and gu.project_id=res.project_id )
+				and exists ( select 1 from xm_group_user gu where gu.userid=#{compete} and gu.project_id=res.project_id )
 			</if>
 			<if test="productId != null and productId !='' ">    and exists( select 1 from xm_menu m where m.menu_id =res.menu_id and m.product_id=#{productId})  </if>
 			<if test="key != null and key !='' ">    and res.case_name like #{key}   </if>