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

# Conflicts:
#	fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceMapper.java
#	fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/AppDeviceBo.java

@@ -0,0 +1,31 @@
+package com.fuyuanshen.equipment.domain.dto;
+
+import com.fuyuanshen.common.core.validate.EditGroup;
+import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 绑定设备参数
+ */
+@Data
+public class AppDeviceBo {
+    /**
+     * 设备IMEI
+     */
+    private String deviceImei;
+
+    /**
+     * 设备MAC
+     */
+    private String deviceMac;
+
+    /**
+     * 通讯方式 0:4G;  1:蓝牙
+     */
+    @NotNull(message = "通讯方式不能为空", groups = { EditGroup.class })
+    private Integer communicationMode;
+
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java

@@ -63,4 +63,6 @@ public class DeviceQueryCriteria extends BaseEntity {
     @Schema(name = "通讯方式", example = "0:4G;1:蓝牙")
     private Integer communicationMode;
 
+    /* app绑定用户id */
+    private Long bindingUserId;
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppDeviceVo.java

@@ -0,0 +1,24 @@
+package com.fuyuanshen.equipment.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class AppDeviceVo {
+
+    private Long id;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 设备IMEI
+     */
+    private String deviceImei;
+
+    /**
+     * 设备MAC
+     */
+    private String deviceMac;
+}