dev #2

Merged
dashixiong merged 349 commits from dev into main 2026-02-11 01:55:46 +00:00
36 changed files with 1975 additions and 14 deletions
Showing only changes of commit 1a56bd6526 - Show all commits

View File

@ -128,7 +128,7 @@ public class EmsPcsData extends BaseEntity
/** 设备唯一标识符 */ /** 设备唯一标识符 */
@Excel(name = "设备唯一标识符") @Excel(name = "设备唯一标识符")
private Long deviceId; private String deviceId;
/** 月 */ /** 月 */
@Excel(name = "") @Excel(name = "")
@ -408,12 +408,12 @@ public class EmsPcsData extends BaseEntity
return siteId; return siteId;
} }
public void setDeviceId(Long deviceId) public void setDeviceId(String deviceId)
{ {
this.deviceId = deviceId; this.deviceId = deviceId;
} }
public Long getDeviceId() public String getDeviceId()
{ {
return deviceId; return deviceId;
} }