From d0d4a8004573673e279343985bfe6497bbc9f6bd Mon Sep 17 00:00:00 2001 From: rain <1679827795@qq.com> Date: Thu, 29 Jan 2026 14:39:05 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDevicePerShareEntity.java | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/fwDevicePerShare/entity/FwDevicePerShareEntity.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDevicePerShareEntity.java similarity index 89% rename from drone-service/drone-fw/src/main/java/org/sxkj/fw/fwDevicePerShare/entity/FwDevicePerShareEntity.java rename to drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDevicePerShareEntity.java index f15ce2f..efb6c12 100644 --- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/fwDevicePerShare/entity/FwDevicePerShareEntity.java +++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDevicePerShareEntity.java @@ -14,7 +14,7 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.sxkj.fw.fwDevicePerShare.entity; +package org.sxkj.fw.device.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; @@ -22,7 +22,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; -import org.springblade.core.tenant.mp.TenantEntity; /** * 设备权限分享表 实体类 @@ -53,11 +52,7 @@ */ @ApiModelProperty(value = "借入方部门ID") private Long loanToDeptId; - /** - * 设备权限菜单ID - */ - @ApiModelProperty(value = "设备权限菜单ID") - private String devicePerMenuId; + /** * 区域编码 */ -- Gitblit v1.9.3