Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteModel.java

@@ -1,7 +1,5 @@
-package cn.estsh.i3plus.pojo.model.mes;
+package cn.estsh.i3plus.pojo.mes.model;
 
-import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcess;
-import cn.estsh.i3plus.pojo.model.wms.WmsActionGroupDetailsModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteProcessModel.java

@@ -1,9 +1,8 @@
-package cn.estsh.i3plus.pojo.model.mes;
+package cn.estsh.i3plus.pojo.mes.model;
 
 import cn.estsh.i3plus.pojo.mes.bean.MesProdRouteOptParam;
 import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcess;
 import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcessStep;
-import cn.estsh.i3plus.pojo.wms.bean.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/SysOrganizeModel.java

@@ -1,23 +0,0 @@
-package cn.estsh.i3plus.pojo.model.mes;
-
-import cn.estsh.i3plus.pojo.mes.bean.MesArea;
-import cn.estsh.i3plus.pojo.platform.bean.SysOrganize;
-import io.swagger.annotations.ApiParam;
-
-import javax.persistence.Transient;
-import java.util.List;
-
-public class SysOrganizeModel extends SysOrganize{
-
-    @Transient
-    @ApiParam(value ="子集列表")
-    private List<MesArea> childTreeList;
-
-    public List<MesArea> getChildTreeList() {
-        return childTreeList;
-    }
-
-    public void setChildTreeList(List<MesArea> childTreeList) {
-        this.childTreeList = childTreeList;
-    }
-}