Merge remote-tracking branch 'origin/develop' into develop

project-order/src/main/java/com/alibaba/cloud/integration/order/dto/KV.java

@@ -4,7 +4,7 @@ import lombok.Data;
 
 
 @Data
 @Data
 public class KV {
 public class KV {
-	private String title;
+	private String label;
 	private String value;
 	private String value;
 	private String type;
 	private String type;
 	private String status;
 	private String status;

project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/OrderServiceDetailImpl.java

@@ -309,7 +309,7 @@ public class OrderServiceDetailImpl implements OrderServiceDetail {
 
 
 	private KV PackKV(String title, String value, String type, String status, Object params) {
 	private KV PackKV(String title, String value, String type, String status, Object params) {
 		KV item = new KV();
 		KV item = new KV();
-		item.setTitle(title);
+		item.setLabel(title);
 		item.setValue(value);
 		item.setValue(value);
 		item.setType(type);
 		item.setType(type);
 		item.setStatus(status);
 		item.setStatus(status);

project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/UserServiceImpl.java

@@ -2,7 +2,6 @@ package com.alibaba.cloud.integration.order.service.impl;
 
 
 import com.alibaba.cloud.integration.common.Result;
 import com.alibaba.cloud.integration.common.Result;
 import com.alibaba.cloud.integration.order.service.UserService;
 import com.alibaba.cloud.integration.order.service.UserService;
-import com.sun.xml.bind.v2.TODO;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import java.util.HashMap;
 import java.util.HashMap;