|
@@ -2,6 +2,8 @@ package com.persagy.proxy.object.model;
|
|
|
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.alibaba.fastjson.annotation.JSONField;
|
|
|
+import com.fasterxml.jackson.annotation.JsonAlias;
|
|
|
+import com.fasterxml.jackson.annotation.JsonProperty;
|
|
|
import com.persagy.proxy.adm.annotations.CascadeColumn;
|
|
|
import com.persagy.proxy.adm.model.AdmPoint;
|
|
|
import com.persagy.proxy.adm.model.AdmBaseEntity;
|
|
@@ -31,7 +33,13 @@ public class AdmEquipment extends AdmBaseEntity<AdmEquipment> {
|
|
|
/** 二维码内容 */
|
|
|
private String defaultQRCode;
|
|
|
/** 设计图纸中编码 */
|
|
|
+// @JsonAlias({"cadId","cADID"})
|
|
|
+// @JsonProperty("cADID")
|
|
|
private String cadId;
|
|
|
+ /** 设计图纸中编码 */
|
|
|
+ @JsonAlias({"cadId","cADID"})
|
|
|
+ @JsonProperty("cADID")
|
|
|
+ private String cADID;
|
|
|
/** RFID标识 */
|
|
|
@JSONField(name = "rFID")
|
|
|
private String rfId;
|