|
@@ -29,6 +29,7 @@ package com.persagy.server.datacenter.models.entities.objects
|
|
|
import com.alibaba.fastjson.annotation.JSONField
|
|
|
import com.persagy.server.datacenter.models.entities.assistant.PointPosition
|
|
|
import com.persagy.server.datacenter.models.entities.assistant.TaskPic
|
|
|
+import com.persagy.server.datacenter.models.entities.dictnew.DefClass
|
|
|
import com.persagy.service.models.SBaseEntity
|
|
|
import com.persagy.service.models.annotations.SCascade
|
|
|
import io.swagger.v3.oas.annotations.media.Schema
|
|
@@ -264,11 +265,11 @@ open class ZoneSpace: Serializable, SBaseEntity() {
|
|
|
@SCascade(table="zone_space_base", idColumn="id", childIdColumn="floor_id")
|
|
|
var floor: Floor? = null
|
|
|
|
|
|
-// /** 级联-空间类型 */
|
|
|
-// @Schema(description = "级联-空间类型")
|
|
|
-// @SCascade(table="zone_space_base", idColumn="id", childIdColumn="object_type")
|
|
|
-// @JSONField(name = "DClassDef")
|
|
|
-// var zoneName: DClassDef? = null
|
|
|
+ /** 级联-空间类型 */
|
|
|
+ @Schema(description = "级联-空间类型")
|
|
|
+ @SCascade(table="zone_space_base", idColumn="id", childIdColumn="object_type",self = false)
|
|
|
+ @JSONField(name = "zoneName")
|
|
|
+ var zoneName: ArrayList<DefClass>? = null
|
|
|
|
|
|
/** 级联-建筑 */
|
|
|
@Schema(description = "级联-建筑")
|