@gizone/rrs-client 3.11.17-alpha.99 → 4.0.0-alpha.105

package/dist/models/work-order-source-enum.d.ts

@@ -22,5 +22,6 @@ export declare const WorkOrderSourceEnum: {
     readonly AiInspectionTransferWorkOrder: "AI_INSPECTION_TRANSFER_WORK_ORDER";
     readonly MaintenanceTransferWorkOrder: "MAINTENANCE_TRANSFER_WORK_ORDER";
     readonly SurveillanceOffLineTransferWorkOrder: "SURVEILLANCE_OFF_LINE_TRANSFER_WORK_ORDER";
+    readonly HkAiAlertTransferWorkOrder: "HK_AI_ALERT_TRANSFER_WORK_ORDER";
 };
 export type WorkOrderSourceEnum = typeof WorkOrderSourceEnum[keyof typeof WorkOrderSourceEnum];

package/dist/models/work-order-source-enum.js

@@ -26,5 +26,6 @@ exports.WorkOrderSourceEnum = {
     InspectionTransferWorkOrder: 'INSPECTION_TRANSFER_WORK_ORDER',
     AiInspectionTransferWorkOrder: 'AI_INSPECTION_TRANSFER_WORK_ORDER',
     MaintenanceTransferWorkOrder: 'MAINTENANCE_TRANSFER_WORK_ORDER',
-    SurveillanceOffLineTransferWorkOrder: 'SURVEILLANCE_OFF_LINE_TRANSFER_WORK_ORDER'
+    SurveillanceOffLineTransferWorkOrder: 'SURVEILLANCE_OFF_LINE_TRANSFER_WORK_ORDER',
+    HkAiAlertTransferWorkOrder: 'HK_AI_ALERT_TRANSFER_WORK_ORDER'
 };

package/dist/models/work-order-type-enum.d.ts

@@ -31,5 +31,6 @@ export declare const WorkOrderTypeEnum: {
     readonly VideoRecognitionAlarm: "VIDEO_RECOGNITION_ALARM";
     readonly AiInspection: "AI_INSPECTION";
     readonly NetworkRepairWorkOrder: "NETWORK_REPAIR_WORK_ORDER";
+    readonly ViolationWorkOrder: "VIOLATION_WORK_ORDER";
 };
 export type WorkOrderTypeEnum = typeof WorkOrderTypeEnum[keyof typeof WorkOrderTypeEnum];

package/dist/models/work-order-type-enum.js

@@ -35,5 +35,6 @@ exports.WorkOrderTypeEnum = {
     GasMeterWorkOrder: 'GAS_METER_WORK_ORDER',
     VideoRecognitionAlarm: 'VIDEO_RECOGNITION_ALARM',
     AiInspection: 'AI_INSPECTION',
-    NetworkRepairWorkOrder: 'NETWORK_REPAIR_WORK_ORDER'
+    NetworkRepairWorkOrder: 'NETWORK_REPAIR_WORK_ORDER',
+    ViolationWorkOrder: 'VIOLATION_WORK_ORDER'
 };

package/models/equipment-detail-dto.ts

@@ -158,12 +158,18 @@ export interface EquipmentDetailDTO {
      * @memberof EquipmentDetailDTO
      */
     'planImage'?: string;
+    /**
+     * 设备点位
+     * @type {Array<number>}
+     * @memberof EquipmentDetailDTO
+     */
+    'equipmentPoint'?: Array<number>;
     /**
      * 空间点位
-     * @type {string}
+     * @type {Array<Array<number>>}
      * @memberof EquipmentDetailDTO
      */
-    'spacePoint'?: string;
+    'spacePoint'?: Array<Array<number>>;
     /**
      * 空间id
      * @type {number}
@@ -218,17 +224,5 @@ export interface EquipmentDetailDTO {
      * @memberof EquipmentDetailDTO
      */
     'relatedEquipmentIds'?: Array<number>;
-    /**
-     * 
-     * @type {string}
-     * @memberof EquipmentDetailDTO
-     */
-    'xaxis'?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof EquipmentDetailDTO
-     */
-    'yaxis'?: string;
 }
 

package/models/equipment-point-edit-vo.ts

@@ -28,15 +28,9 @@ export interface EquipmentPointEditVo {
     'id': number;
     /**
      * 点位编码
-     * @type {string}
+     * @type {Array<number>}
      * @memberof EquipmentPointEditVo
      */
-    'equipmentPointXAxis'?: string;
-    /**
-     * 点位编码
-     * @type {string}
-     * @memberof EquipmentPointEditVo
-     */
-    'equipmentPointYAxis'?: string;
+    'equipmentPoint'?: Array<number>;
 }
 

package/models/equipment-search-system-dto.ts

@@ -173,12 +173,6 @@ export interface EquipmentSearchSystemDTO {
      * @memberof EquipmentSearchSystemDTO
      */
     'planImage'?: string;
-    /**
-     * 空间点位
-     * @type {string}
-     * @memberof EquipmentSearchSystemDTO
-     */
-    'spacePoint'?: string;
     /**
      * 出厂时间
      * @type {string}
@@ -234,16 +228,16 @@ export interface EquipmentSearchSystemDTO {
      */
     'relatedEquipmentIds'?: Array<number>;
     /**
-     * 
-     * @type {string}
+     * 设备点位
+     * @type {Array<number>}
      * @memberof EquipmentSearchSystemDTO
      */
-    'xaxis'?: string;
+    'equipmentPoint'?: Array<number>;
     /**
-     * 
-     * @type {string}
+     * 空间点位
+     * @type {Array<Array<number>>}
      * @memberof EquipmentSearchSystemDTO
      */
-    'yaxis'?: string;
+    'spacePoint'?: Array<Array<number>>;
 }
 

package/models/get-user-wx200-response.ts

@@ -64,16 +64,16 @@ export interface GetUserWx200Response {
     'outputStream'?: GetUserWx200ResponseOutputStream;
     /**
      * 
-     * @type {number}
+     * @type {GetUserWx200ResponseLocale}
      * @memberof GetUserWx200Response
      */
-    'bufferSize'?: number;
+    'locale'?: GetUserWx200ResponseLocale;
     /**
      * 
-     * @type {GetUserWx200ResponseLocale}
+     * @type {number}
      * @memberof GetUserWx200Response
      */
-    'locale'?: GetUserWx200ResponseLocale;
+    'bufferSize'?: number;
     /**
      * 
      * @type {string}

package/models/index.ts

@@ -536,6 +536,7 @@ export * from './json-result-sys-user-msg-dto';
 export * from './json-result-unloading-area-entity';
 export * from './json-result-user-add-redis-list-vo';
 export * from './json-result-user-settings-entity';
+export * from './json-result-violation-work-order-details-dto';
 export * from './json-result-void';
 export * from './json-result-white-add-redis-list-dto';
 export * from './json-result-work-order-dept-settings-entity';
@@ -820,6 +821,13 @@ export * from './user-settings-update-bo';
 export * from './user-whether-privacy-dto';
 export * from './user-white-del-dto';
 export * from './vehicle-payment-bo';
+export * from './violation-center-attribute-enum';
+export * from './violation-decision-vo';
+export * from './violation-issue-type-enum';
+export * from './violation-responsibility-role-enum';
+export * from './violation-work-order-add-vo';
+export * from './violation-work-order-details-dto';
+export * from './violation-work-order-info';
 export * from './water-meter-add-or-edit-vo';
 export * from './water-meter-details-search-vo';
 export * from './water-meter-search-vo';
@@ -835,6 +843,7 @@ export * from './white-black-del-vo';
 export * from './white-edit-vo';
 export * from './white-search-vo';
 export * from './work-order-add-vo';
+export * from './work-order-approval-vo';
 export * from './work-order-circulation-vo';
 export * from './work-order-comment-dto';
 export * from './work-order-comment-entity';

package/models/json-result-violation-work-order-details-dto.ts

@@ -0,0 +1,66 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * OpenAPI definition
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: v0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+// May contain unused imports in some cases
+// @ts-ignore
+import type { BaseErrorResult } from './base-error-result';
+// May contain unused imports in some cases
+// @ts-ignore
+import type { ViolationWorkOrderDetailsDto } from './violation-work-order-details-dto';
+
+/**
+ * 
+ * @export
+ * @interface JsonResultViolationWorkOrderDetailsDto
+ */
+export interface JsonResultViolationWorkOrderDetailsDto {
+    /**
+     * 错误码，0：成功，其他：失败
+     * @type {number}
+     * @memberof JsonResultViolationWorkOrderDetailsDto
+     */
+    'code'?: number;
+    /**
+     * 错误消息
+     * @type {string}
+     * @memberof JsonResultViolationWorkOrderDetailsDto
+     */
+    'msg'?: string;
+    /**
+     * 错误堆栈
+     * @type {string}
+     * @memberof JsonResultViolationWorkOrderDetailsDto
+     */
+    'stacks'?: string;
+    /**
+     * 
+     * @type {ViolationWorkOrderDetailsDto}
+     * @memberof JsonResultViolationWorkOrderDetailsDto
+     */
+    'data'?: ViolationWorkOrderDetailsDto | null;
+    /**
+     * 
+     * @type {BaseErrorResult}
+     * @memberof JsonResultViolationWorkOrderDetailsDto
+     */
+    'error'?: BaseErrorResult | null;
+    /**
+     * 日志追踪ID
+     * @type {string}
+     * @memberof JsonResultViolationWorkOrderDetailsDto
+     */
+    'traceId'?: string | null;
+}
+

package/models/violation-center-attribute-enum.ts

@@ -0,0 +1,31 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * OpenAPI definition
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: v0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+
+/**
+ * 违规工单中心属性
+ * @export
+ * @enum {string}
+ */
+
+export const ViolationCenterAttributeEnum = {
+    OriginWarehouse: 'ORIGIN_WAREHOUSE',
+    BelongWarehouse: 'BELONG_WAREHOUSE'
+} as const;
+
+export type ViolationCenterAttributeEnum = typeof ViolationCenterAttributeEnum[keyof typeof ViolationCenterAttributeEnum];
+
+
+

package/models/violation-decision-vo.ts

@@ -0,0 +1,80 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * OpenAPI definition
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: v0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+// May contain unused imports in some cases
+// @ts-ignore
+import type { ViolationCenterAttributeEnum } from './violation-center-attribute-enum';
+// May contain unused imports in some cases
+// @ts-ignore
+import type { ViolationResponsibilityRoleEnum } from './violation-responsibility-role-enum';
+
+/**
+ * 违规工单判定参数
+ * @export
+ * @interface ViolationDecisionVo
+ */
+export interface ViolationDecisionVo {
+    /**
+     * 是否成立
+     * @type {boolean}
+     * @memberof ViolationDecisionVo
+     */
+    'isEstablished'?: boolean;
+    /**
+     * 违规数量
+     * @type {number}
+     * @memberof ViolationDecisionVo
+     */
+    'violationCount'?: number;
+    /**
+     * OMS订单号
+     * @type {string}
+     * @memberof ViolationDecisionVo
+     */
+    'omsNo'?: string;
+    /**
+     * 
+     * @type {ViolationResponsibilityRoleEnum}
+     * @memberof ViolationDecisionVo
+     */
+    'responsibilityRole'?: ViolationResponsibilityRoleEnum;
+    /**
+     * 责任供应商
+     * @type {string}
+     * @memberof ViolationDecisionVo
+     */
+    'responsibilitySupplier'?: string;
+    /**
+     * 责任人
+     * @type {string}
+     * @memberof ViolationDecisionVo
+     */
+    'responsibilityUser'?: string;
+    /**
+     * 
+     * @type {ViolationCenterAttributeEnum}
+     * @memberof ViolationDecisionVo
+     */
+    'centerAttribute'?: ViolationCenterAttributeEnum;
+    /**
+     * 索赔内容
+     * @type {string}
+     * @memberof ViolationDecisionVo
+     */
+    'claimContent'?: string;
+}
+
+
+

package/models/violation-issue-type-enum.ts

@@ -0,0 +1,94 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * OpenAPI definition
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: v0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+
+/**
+ * 违规工单问题类型
+ * @export
+ * @enum {string}
+ */
+
+export const ViolationIssueTypeEnum = {
+    HighAltitudeWorkWithoutSafetyHelmetOrSafetyRope: 'HIGH_ALTITUDE_WORK_WITHOUT_SAFETY_HELMET_OR_SAFETY_ROPE',
+    WorkersWearingShortsOrSlippersInWarehouseArea: 'WORKERS_WEARING_SHORTS_OR_SLIPPERS_IN_WAREHOUSE_AREA',
+    ForkliftViolationLiftingPeopleForHighWork: 'FORKLIFT_VIOLATION_LIFTING_PEOPLE_FOR_HIGH_WORK',
+    HighShelfWarehouseWorkWithoutSafetyHelmet: 'HIGH_SHELF_WAREHOUSE_WORK_WITHOUT_SAFETY_HELMET',
+    ParkedVehiclesNotFollowingFourCapTwoWedgeRule: 'PARKED_VEHICLES_NOT_FOLLOWING_FOUR_CAP_TWO_WEDGE_RULE',
+    ForkliftNotRemovingKeyAfterParking: 'FORKLIFT_NOT_REMOVING_KEY_AFTER_PARKING',
+    ForkliftParkedInWarehouseAfterShiftForksNotReset: 'FORKLIFT_PARKED_IN_WAREHOUSE_AFTER_SHIFT_FORKS_NOT_RESET',
+    PlatformIllegalCharging: 'PLATFORM_ILLEGAL_CHARGING',
+    WarehouseAreaIllegalSmoking: 'WAREHOUSE_AREA_ILLEGAL_SMOKING',
+    VehiclesIllegallyEnteringWarehouseArea: 'VEHICLES_ILLEGALLY_ENTERING_WAREHOUSE_AREA',
+    OtherSafetyViolations: 'OTHER_SAFETY_VIOLATIONS',
+    FireExitBlocked: 'FIRE_EXIT_BLOCKED',
+    GoodsBlockingFireFightingEquipment: 'GOODS_BLOCKING_FIRE_FIGHTING_EQUIPMENT',
+    DebrisPiledInFrontOfPowerDistributionEquipment: 'DEBRIS_PILED_IN_FRONT_OF_POWER_DISTRIBUTION_EQUIPMENT',
+    AntiTheftDoorLyingFlatSidewaysOrUpsideDown: 'ANTI_THEFT_DOOR_LYING_FLAT_SIDEWAYS_OR_UPSIDE_DOWN',
+    GoodsStackedTooHigh: 'GOODS_STACKED_TOO_HIGH',
+    DampGoods: 'DAMP_GOODS',
+    TvIllegalStackingHeavyOnLight: 'TV_ILLEGAL_STACKING_HEAVY_ON_LIGHT',
+    GoodsWithPenetratingDamage: 'GOODS_WITH_PENETRATING_DAMAGE',
+    SidewaysOrUpsideDown: 'SIDEWAYS_OR_UPSIDE_DOWN',
+    GoodsStained: 'GOODS_STAINED',
+    GoodsWithScribbledPackaging: 'GOODS_WITH_SCRIBBLED_PACKAGING',
+    IrregularGoodsStacking: 'IRREGULAR_GOODS_STACKING',
+    DamagedGoodsAreaNotSet: 'DAMAGED_GOODS_AREA_NOT_SET',
+    GoodsCrushedOrDeformed: 'GOODS_CRUSHED_OR_DEFORMED',
+    IncorrectClampingSurfacePlacement: 'INCORRECT_CLAMPING_SURFACE_PLACEMENT',
+    GoodsWithFootprintsOnPackaging: 'GOODS_WITH_FOOTPRINTS_ON_PACKAGING',
+    TvDamageOrDirtyPackaging: 'TV_DAMAGE_OR_DIRTY_PACKAGING',
+    DustyGoods: 'DUSTY_GOODS',
+    AntiTippingMeasuresMissing: 'ANTI_TIPPING_MEASURES_MISSING',
+    WarehouseLeakage: 'WAREHOUSE_LEAKAGE',
+    UpsideDownOrSidewaysNonTvAppliances: 'UPSIDE_DOWN_OR_SIDEWAYS_NON_TV_APPLIANCES',
+    DamagedBoxesOnArrival: 'DAMAGED_BOXES_ON_ARRIVAL',
+    ImproperTvLoading: 'IMPROPER_TV_LOADING',
+    WorkingInRain: 'WORKING_IN_RAIN',
+    HeavyOnLight: 'HEAVY_ON_LIGHT',
+    DampOrDirtyContainer: 'DAMP_OR_DIRTY_CONTAINER',
+    ImproperTvStorage: 'IMPROPER_TV_STORAGE',
+    TvWetOrDamagedBox: 'TV_WET_OR_DAMAGED_BOX',
+    WrongClampingSurface: 'WRONG_CLAMPING_SURFACE',
+    DraggingGoodsOnGround: 'DRAGGING_GOODS_ON_GROUND',
+    ClampingTooHighAndDropping: 'CLAMPING_TOO_HIGH_AND_DROPPING',
+    ImproperClampingOfWashingMachines: 'IMPROPER_CLAMPING_OF_WASHING_MACHINES',
+    ImproperClampingOfRefrigerators: 'IMPROPER_CLAMPING_OF_REFRIGERATORS',
+    CornersOnGround: 'CORNERS_ON_GROUND',
+    ClampingDifferentSpecsSimultaneously: 'CLAMPING_DIFFERENT_SPECS_SIMULTANEOUSLY',
+    SqueezingOperationOfClampingTruck: 'SQUEEZING_OPERATION_OF_CLAMPING_TRUCK',
+    ImproperHandlingByPersonnel: 'IMPROPER_HANDLING_BY_PERSONNEL',
+    ThrowingGoods: 'THROWING_GOODS',
+    ImproperTvHandling: 'IMPROPER_TV_HANDLING',
+    ManualWorkTooHighAndDropping: 'MANUAL_WORK_TOO_HIGH_AND_DROPPING',
+    RoughHandlingOfTvs: 'ROUGH_HANDLING_OF_TVS',
+    ImproperClampingOfMassageChairs: 'IMPROPER_CLAMPING_OF_MASSAGE_CHAIRS',
+    ImproperElectronicWaybillAttachment: 'IMPROPER_ELECTRONIC_WAYBILL_ATTACHMENT',
+    ClampingAndDragging: 'CLAMPING_AND_DRAGGING',
+    IndustryClaimRecovery: 'INDUSTRY_CLAIM_RECOVERY',
+    AssetDamage: 'ASSET_DAMAGE',
+    ElectricityWaste: 'ELECTRICITY_WASTE',
+    NotSingleBuildingGoodsCollection: 'NOT_SINGLE_BUILDING_GOODS_COLLECTION',
+    FalseInventory: 'FALSE_INVENTORY',
+    SixSProblem: 'SIX_S_PROBLEM',
+    NoTeamMeeting: 'NO_TEAM_MEETING',
+    PlatformStagingAreaNotCleared: 'PLATFORM_STAGING_AREA_NOT_CLEARED',
+    UtilizationProblem: 'UTILIZATION_PROBLEM',
+    NoOneInControlRoom: 'NO_ONE_IN_CONTROL_ROOM'
+} as const;
+
+export type ViolationIssueTypeEnum = typeof ViolationIssueTypeEnum[keyof typeof ViolationIssueTypeEnum];
+
+
+

package/models/violation-responsibility-role-enum.ts

@@ -0,0 +1,31 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * OpenAPI definition
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: v0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+
+/**
+ * 违规工单责任角色
+ * @export
+ * @enum {string}
+ */
+
+export const ViolationResponsibilityRoleEnum = {
+    SafetyCommissioner: 'SAFETY_COMMISSIONER',
+    QualityCommissioner: 'QUALITY_COMMISSIONER'
+} as const;
+
+export type ViolationResponsibilityRoleEnum = typeof ViolationResponsibilityRoleEnum[keyof typeof ViolationResponsibilityRoleEnum];
+
+
+

package/models/violation-work-order-add-vo.ts

@@ -0,0 +1,101 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * OpenAPI definition
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: v0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+// May contain unused imports in some cases
+// @ts-ignore
+import type { ViolationIssueTypeEnum } from './violation-issue-type-enum';
+// May contain unused imports in some cases
+// @ts-ignore
+import type { WorkOrderIssueTypeEnum } from './work-order-issue-type-enum';
+// May contain unused imports in some cases
+// @ts-ignore
+import type { WorkOrderSourceEnum } from './work-order-source-enum';
+
+/**
+ * 违规工单新增
+ * @export
+ * @interface ViolationWorkOrderAddVo
+ */
+export interface ViolationWorkOrderAddVo {
+    /**
+     * 
+     * @type {WorkOrderIssueTypeEnum}
+     * @memberof ViolationWorkOrderAddVo
+     */
+    'issueType': WorkOrderIssueTypeEnum;
+    /**
+     * 
+     * @type {ViolationIssueTypeEnum}
+     * @memberof ViolationWorkOrderAddVo
+     */
+    'violationIssueType': ViolationIssueTypeEnum;
+    /**
+     * 执行部门ID
+     * @type {Array<number>}
+     * @memberof ViolationWorkOrderAddVo
+     */
+    'deptIds': Array<number>;
+    /**
+     * 工单执行人
+     * @type {number}
+     * @memberof ViolationWorkOrderAddVo
+     */
+    'handlerUserId'?: number;
+    /**
+     * 设备id
+     * @type {Array<number>}
+     * @memberof ViolationWorkOrderAddVo
+     */
+    'equipmentIds': Array<number>;
+    /**
+     * 位置
+     * @type {number}
+     * @memberof ViolationWorkOrderAddVo
+     */
+    'spaceId': number;
+    /**
+     * 工单名称
+     * @type {string}
+     * @memberof ViolationWorkOrderAddVo
+     */
+    'workOrderName'?: string;
+    /**
+     * 图片
+     * @type {Array<string>}
+     * @memberof ViolationWorkOrderAddVo
+     */
+    'images'?: Array<string>;
+    /**
+     * 视频
+     * @type {Array<string>}
+     * @memberof ViolationWorkOrderAddVo
+     */
+    'imagesVideo'?: Array<string>;
+    /**
+     * 园区id
+     * @type {number}
+     * @memberof ViolationWorkOrderAddVo
+     */
+    'parkId': number;
+    /**
+     * 
+     * @type {WorkOrderSourceEnum}
+     * @memberof ViolationWorkOrderAddVo
+     */
+    'workOrderSource': WorkOrderSourceEnum;
+}
+
+
+