diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/EquipmentEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/EquipmentEntity.java
index f7795037..5250bc59 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/EquipmentEntity.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/EquipmentEntity.java
@@ -33,6 +33,8 @@ import org.springblade.core.mp.base.BaseEntity;
 
 import java.io.Serial;
 import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 设备信息表 实体类
@@ -48,7 +50,30 @@ public class EquipmentEntity extends BaseEntity {
 
 	@Serial
 	private static final long serialVersionUID = 1L;
+	/**
+	 * 正常服役
+	 */
+	public static Long USED_OK = 1L;
+	/**
+	 * 服役中
+	 */
+	public static Long USED_AFOOT = 2L;
+	/**
+	 * 暂停服役
+	 */
+	public static Long USED_PAUSE = 3L;
+
+	public static Map<Long, String> usedMap = new HashMap<Long, String>();
 
+	static {
+		usedMap.put(USED_OK, "正常服役");
+		usedMap.put(USED_AFOOT, "服役中");
+		usedMap.put(USED_PAUSE, "暂停服役");
+	}
+
+	public String getUsedText() {
+		return usedMap.get(this.used);
+	}
 	/**
 	 * 设备编码
 	 */
@@ -72,8 +97,8 @@ public class EquipmentEntity extends BaseEntity {
 	/**
 	 * 服役状态;1、正常服役，2、暂停服役
 	 */
-	@Schema(description = "服役状态;1、正常服役，2、暂停服役")
-	private BigDecimal used;
+	@Schema(description = "服役状态;1、正常服役，2、暂停服役，3、暂停服役")
+	private Long used;
 	/**
 	 * RFID
 	 */
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java
index d2e84e4f..89527e90 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java
@@ -154,6 +154,19 @@ public class EquipmentController extends BladeController {
 		return R.data(equipmentStatusStatisticsVO);
 	}
 
+	/**
+	 * 修改ip
+	 */
+	@PostMapping("/editIp")
+	@ApiOperationSupport(order = 8)
+	@Operation(summary = "修改ip", description = "传入设备主键id和修改后的IP")
+	public R editIp(
+			@Parameter(description = "设备ip", required = true) @RequestParam String ip,
+			@Parameter(description = "设备id", required = true) @RequestParam Long deviceId) {
+		Boolean result = equipmentService.editIp(ip, deviceId);
+		return R.status(result);
+	}
+
 	/**
 	 * 导出数据
 	 */
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IEquipmentService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IEquipmentService.java
index 468f5fd1..8dbf2e21 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IEquipmentService.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IEquipmentService.java
@@ -65,4 +65,13 @@ public interface IEquipmentService extends BaseService<EquipmentEntity> {
 	 * @return
 	 */
 	EquipmentStatusStatisticsVO stateStatistics();
+
+	/**
+	 * 修改设备ip
+	 *
+	 * @param ip
+	 * @param deviceId
+	 * @return
+	 */
+	Boolean editIp(String ip, Long deviceId);
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/EquipmentServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/EquipmentServiceImpl.java
index 12922a57..3ddd071c 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/EquipmentServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/EquipmentServiceImpl.java
@@ -83,4 +83,12 @@ public class EquipmentServiceImpl extends BaseServiceImpl<EquipmentMapper, Equip
 		return baseMapper.stateStatistics();
 	}
 
+	@Override
+	public Boolean editIp(String ip, Long deviceId) {
+		EquipmentEntity equipment = new EquipmentEntity();
+		equipment.setId(deviceId);
+		equipment.setDeviceIp(ip);
+		return this.updateById(equipment);
+	}
+
 }