Merge remote-tracking branch 'origin/master'

blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java

@@ -14,9 +14,9 @@ public interface LauncherConstant {
      */
 //	String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e";
 	// 生产环境
-//	String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401";
+	String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401";
 	// 测试环境
-	String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8";
+//	String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8";
 
     /**
      * nacos 用户名

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/YieldOrderEnum.java

@@ -66,11 +66,11 @@ public enum YieldOrderEnum {
 	/**
 	 * 生产订单 排产优先级
 	 */
-	PRIORITY_APS_CRITICAL("1级-极高紧急度", 15001),
-	PRIORITY_APS_HIGH("2级-高紧急度", 15002),
-	PRIORITY_APS_MEDIUM("3级-中紧急度", 15003),
-	PRIORITY_APS_LOW("4级-低紧急度", 15004),
-	PRIORITY_APS_NORMAL("5级-正常", 15005),
+	PRIORITY_APS_CRITICAL("1级", 15001),
+	PRIORITY_APS_HIGH("2级", 15002),
+	PRIORITY_APS_MEDIUM("3级", 15003),
+	PRIORITY_APS_LOW("4级", 15004),
+	PRIORITY_APS_NORMAL("5级", 15005),
 
 	/**
 	 * 生产订单 校验结果，16001：未验证，16002：数据缺失，16003：工艺缺失，16004：资源缺失，16005：交期冲突, 16006:验证完成