Jenkins自动合并

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -3379,7 +3379,7 @@ public class MesEnumUtil {
         TASK_COMPLETE("taskComplete", "整个扫描完成"),
         STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"),
         RUNNING_INFO("runningInfo", "执行信息"),
-        RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean");
+        STOP_PCS_CTL("stopPcsCtl", "停止监控");
 
 
         private String value;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -1533,10 +1533,10 @@ public class MesPcnEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum DATA_SOURCE_TYPE {
-        SOURCE_MARIA_DB(10, "MariaDB", "MariaDB 10.1", "com.mysql.jdbc.Driver", 3306, null),
-        SOURCE_SQL_SERVER(20, "SQL Server", "SQL Server 2017", "com.microsoft.sqlserver.jdbc.SQLServerDriver", 1433, "dbo"),
-        SOURCE_ORACLE(30, "Oracle", "Oralce 12C", "oracle.jdbc.driver.OracleDriver", 1521, null),
-        SOURCE_POSTGRE_SQL(40, "PostgreSql", "PostgreSql 10.5", "org.postgresql.Driver", 5432, "public");
+        SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1", "com.mysql.jdbc.Driver", 3306, null),
+        SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017", "com.microsoft.sqlserver.jdbc.SQLServerDriver", 1433, "dbo"),
+        SOURCE_ORACLE(300, "Oracle", "Oralce 12C", "oracle.jdbc.driver.OracleDriver", 1521, null),
+        SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5", "org.postgresql.Driver", 5432, "public");
 
         private int value;
         private String code;

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

@@ -19,11 +19,11 @@ public class StepResult<T> {
     private String msg;
 
     public static StepResult getSuccessComplete() {
-        return new StepResult(true);
+        return new StepResult(true,"");
     }
 
     public static StepResult getNonComplete() {
-        return new StepResult(false);
+        return new StepResult(false,"");
     }
 
     public static StepResult getSuccessComplete(String msg) {