Merge branch 'sxy' into dev

internal/logic/bundleLogic.go

@@ -269,6 +269,7 @@ func BundleDetailV2(req *bundle.BundleDetailRequest) (res *bundle.BundleDetailRe
 					ValueAddUuid: valueAddService.ValueUid,
 					IsDisplay:    valueAddService.IsDisplay,
 					ServiceName:  valueAddDetail.ServiceName,
+					ServiceType:  valueAddDetail.ServiceType,
 				}
 				selectValueAddServices = append(selectValueAddServices, selectValueAddService)
 			}

pb/bundle.proto

@@ -274,6 +274,8 @@ message SelectValueAddService {
 	string valueAddUuid = 1 [json_name = "valueAddUuid"];
   string serviceName= 2 [json_name = "serviceName"];
   bool isDisplay = 3 [json_name = "isDisplay"];
+  int32 serviceType = 4 [json_name = "serviceType"];
+
 }
 message DelBundleRequest {
   string uuid = 1 [json_name = "uuid"];