Merge remote-tracking branch 'remotes/origin/master' into wmj

# Conflicts:
#	.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml

.idea/dictionaries/zhai_.xml

@@ -3,6 +3,7 @@
     <words>
       <w>excpt</w>
       <w>gdms</w>
+      <w>hmmss</w>
       <w>mariadb</w>
       <w>synchronizable</w>
     </words>

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_10" default="false" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_10" default="false" project-jdk-name="10" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

src/core/process/LastProcess.java

@@ -0,0 +1,4 @@
+package core.process;
+
+public abstract class LastProcess extends Process {
+}

src/core/process/Process.java

@@ -2,17 +2,14 @@ package core.process;
 
 import core.operation.Operation;
 
-public abstract class Process implements Cloneable{
+public abstract class Process{
+
+    private char status;
 
     private String permission;
     private Operation operation;
     private String buttonName;
     private String info;
-    @Override
-    public Process clone(){
-        //todo
-        return null;
-    }
 
     public String getPermission() {
         return permission;
@@ -45,4 +42,12 @@ public abstract class Process implements Cloneable{
     public void setInfo(String info) {
         this.info = info;
     }
+
+    public char getStatus() {
+        return status;
+    }
+
+    public void setStatus(char status) {
+        this.status = status;
+    }
 }

src/core/process/ProcessManagement.java

@@ -5,5 +5,7 @@ public class ProcessManagement {
     public Condition getCondition(String userType, List<Integer> index){
         return null;
     }
-
+    public Process getProcess(int index){
+        return null;
+    }
 }

src/core/process/TempProcess.java

@@ -0,0 +1,22 @@
+package core.process;
+
+public abstract class TempProcess extends Process {
+    public static String process;
+    public static String nextProcess;
+
+    public static String getProcess() {
+        return process;
+    }
+
+    public static void setProcess(String process) {
+        TempProcess.process = process;
+    }
+
+    public static String getNextProcess() {
+        return nextProcess;
+    }
+
+    public static void setNextProcess(String nextProcess) {
+        TempProcess.nextProcess = nextProcess;
+    }
+}

src/gdms/test.java

@@ -19,5 +19,11 @@ public class test {
         Select sql = new Select(list,"zx",map,1,2);
         System.out.println(sql.getSQL());
         System.out.println(Utils.getFilePathName("a","b"));
+        String a = "a";
+        changeB(a);
+        System.out.println(a);
+    }
+    static void changeB(String a){
+        a="B";
     }
 }