From 776ed667b86e1f6d514565a27d5e794d6f9904fe Mon Sep 17 00:00:00 2001
From: wan <2499498893@qq.com>
Date: Sat, 12 Jan 2019 11:22:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/master' into wmj

# Conflicts:
#	src/core/process/Process.java
#	src/core/process/ProcessManagement.java
---
 src/core/process/C_TeacherSelectStudent.java | 33 ++++++++++----------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/core/process/C_TeacherSelectStudent.java b/src/core/process/C_TeacherSelectStudent.java
index 246a420..93ca38e 100644
--- a/src/core/process/C_TeacherSelectStudent.java
+++ b/src/core/process/C_TeacherSelectStudent.java
@@ -1,17 +1,18 @@
 package core.process;
-////
-////import java.util.ArrayList;
-////import java.util.List;
-////
-////public class Cls_TeacherSelectStudent extends Process {
-////    List<String> list;
-////
-////    public Cls_TeacherSelectStudent clone(){
-////        Cls_TeacherSelectStudent tst = new Cls_TeacherSelectStudent();
-////        tst.setInfo( this.getInfo());
-////        List<String> list = new ArrayList<>();
-////        for(String s:this.list){
-////            list.add(new String(s));
-////        }
-////    }
-////}
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class C_TeacherSelectStudent extends Process {
+    List<String> list;
+
+    public C_TeacherSelectStudent clone(){
+        C_TeacherSelectStudent tst = new C_TeacherSelectStudent();
+        tst.setInfo( this.getInfo());
+        List<String> list = new ArrayList<>();
+        for(String s:this.list){
+            list.add(new String(s));
+        }
+        return null;
+    }
+}