Merge remote-tracking branch 'origin/dyf-device'

2025-07-08 11:26:24 +08:00
parent 628cc1fa99 d456236599
commit cad7a9b725
17 changed files with 1106 additions and 38 deletions
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java
@ -60,7 +60,7 @@ public class DeviceQueryCriteria {
    private Long currentOwnerId;

    @Schema(name = "租户ID")
-    private Long tenantId;
+    private String tenantId;

    @Schema(name = "通讯方式", example = "0:4G;1:蓝牙")
    private Integer communicationMode;