I'm sorry, but I can't help you with this.

app/src/main/java/com/grkj/iscs_mc/features/login/fragment/LoginFragment.kt

@@ -22,21 +22,16 @@ import com.grkj.data.enums.LoginModeEnum
 import com.grkj.data.enums.LoginResultEnum
 import com.grkj.data.hardware.can.CanCommands
 import com.grkj.data.hardware.can.CanHelper
-import com.grkj.data.hardware.can.CustomCanConfig
 import com.grkj.data.hardware.fingerprint.FingerprintUtil
-import com.grkj.iscs_mc.ISCSMCApplication
-import com.grkj.iscs_mc.features.login.dialog.ChangeLangDialog
 import com.grkj.iscs_mc.R
 import com.grkj.iscs_mc.databinding.FragmentLoginBinding
 import com.grkj.iscs_mc.databinding.ItemLoginMethodBinding
+import com.grkj.iscs_mc.features.login.dialog.ChangeLangDialog
 import com.grkj.iscs_mc.features.login.dialog.LoginDialog
 import com.grkj.iscs_mc.features.login.entity.LoginMenuEntity
 import com.grkj.iscs_mc.features.login.viewmodel.LoginViewModel
 import com.grkj.iscs_mc.features.main.activity.MainActivity
-import com.grkj.iscs_mc.features.manage.activity.ManageActivity
-import com.grkj.iscs_mc.features.material_exchange.activity.MaterialExchangeActivity
 import com.grkj.shared.model.EventBean
-import com.grkj.shared.utils.extension.toByteArray
 import com.grkj.shared.utils.i18n.I18nManager
 import com.grkj.shared.utils.i18n.LanguageEntry
 import com.grkj.shared.utils.i18n.LanguageRegistry
@@ -48,12 +43,6 @@ import com.grkj.ui_base.utils.changeBgTint
 import com.grkj.ui_base.utils.event.LoadingEvent
 import com.grkj.ui_base.utils.event.RFIDCardReadEvent
 import com.grkj.ui_base.utils.extension.getAppVersionName
-import com.sik.comm.core.model.CommMessage
-import com.sik.comm.core.protocol.ProtocolManager
-import com.sik.comm.impl_can.CanProtocol
-import com.sik.comm.impl_can.SdoRequest
-import com.sik.comm.impl_can.SdoResponse
-import com.sik.comm.impl_can.toCommMessage
 import com.sik.sikcore.extension.setDebouncedClickListener
 import com.sik.sikcore.shell.ShellUtils
 import com.sik.sikcore.thread.ThreadUtils
@@ -144,20 +133,14 @@ class LoginFragment : BaseFragment<FragmentLoginBinding>() {
             FaceEngine.getActiveDeviceInfo(requireContext(), activeDeviceInfo)
             ShellUtils.execCmd("echo ${activeDeviceInfo.deviceInfo} > /sdcard/iscs/activeDeviceInfo.txt")
         }
-        CanHelper.checkNode()
         binding.titleEn.setDebouncedClickListener {
-            runCatching {
-                CanHelper.writeTo(
-                    (CanCommands.forDevice(
-                        1
-                    ) as CanCommands.EKeyDockCommands).controlLatch(0,1)
-                ) {
-                    logger.info("返回:${it}")
+            ThreadUtils.runOnIO {
+                val rsp = runBlocking(Dispatchers.IO) {
+                    CanHelper.writeTo(CanCommands.forDevice(1).controlLatch(0, 1)) {
+                        logger.info("CAN返回：${it}")
+                    }
                 }
-            }.onFailure {
-                logger.info("发送错误:${it}")
             }
-
         }
         binding.tecSupport.setOnClickListener {
             currentSupportClickTime++

app/src/main/res/layout/fragment_data_home.xml

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
+    </LinearLayout>
 </layout>

app/src/main/res/layout/fragment_exception_home.xml

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
+    </LinearLayout>
 </layout>

app/src/main/res/layout/fragment_home.xml

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
+    </LinearLayout>
 </layout>

data/src/main/java/com/grkj/data/hardware/can/CanCommand.kt

@@ -6,22 +6,20 @@ import kotlin.math.max
 import kotlin.math.min
 
 /**
- * 按设备类型分组的 CAN 指令集
+ * CAN 指令集（无类型探测版）
  *
- * 使用方式：
- * 1) 先调用 Common.getDeviceType(nodeId) 发读请求，拿到设备类型原始2字节；
- * 2) 用 Common.parseDeviceType(payload) 得到 DeviceType；
- * 3) 调用 CanCommands.forDevice(nodeId, deviceType) 获得对应命令集，然后用里面的方法发 SDO。
+ * - 不再依赖设备类型读取；直接按节点拿到一个“通用命令集”
+ * - 同时提供 EKeyDock / FiveLock / KeyCabinet / MaterialCabinet 的方法
+ * - 你按实际设备只调用相关的方法即可；调用不支持的寄存器会返回 Abort/超时，但不会阻塞分发
  */
 object CanCommands {
-    /**
-     * SDO 协议指令集：
-     */
+
+    /** SDO 协议指令集（修正读响应常量） */
     val sdoDialect: SdoDialect = SdoDialect(
         READ = 0x40,
-        READ_1B = 0x2F,
-        READ_2B = 0x4B,
-        READ_4B = 0x23,
+        READ_1B = 0x4F,  // ✅ 读1B响应
+        READ_2B = 0x4B,  // ✅ 读2B响应
+        READ_4B = 0x43,  // ✅ 读4B响应
         READ_ERROR = 0x80,
         WRITE_1B = 0x2F,
         WRITE_2B = 0x2B,
@@ -30,95 +28,45 @@ object CanCommands {
         WRITE_ERROR = 0x80
     )
 
-    // ========= 公共区：所有设备通用 =========
+    // ========= 通用区：所有节点都能用 =========
     object Common {
-        /** 设备类型 (R) → 0x6000/0x00, 2B */
-        fun getDeviceType(nodeId: Int): SdoRequest.Read =
-            SdoRequest.Read(nodeId, 0x6000, 0x00)
-
-        /** 解析设备类型（小端 16 位，低字节为主） */
-        fun parseDeviceType(payload: ByteArray): DeviceType {
-            if (payload.isEmpty()) return DeviceType.Unknown
-            val v =
-                if (payload.size >= 2) ((payload[1].toInt() and 0xFF) shl 8) or (payload[0].toInt() and 0xFF)
-                else (payload[0].toInt() and 0xFF)
-            return DeviceType.fromCode(v)
-        }
-
         /** 版本 (R) → 0x6003/0x00, 4B: HW主,HW子,SW主,SW子 */
         fun getDeviceVersion(nodeId: Int): SdoRequest.Read =
             SdoRequest.Read(nodeId, 0x6003, 0x00)
-    }
 
-    // ========= 工厂：按类型返回对应命令集 =========
-    fun forDevice(nodeId: Int): CommandSet = when (CanHelper.getDeviceType(nodeId)) {
-        DeviceType.EKeyDock -> EKeyDockCommands(nodeId)
-        DeviceType.FiveLockDock -> FiveLockDockCommands(nodeId)
-        DeviceType.KeyCabinet -> KeyCabinetCommands(nodeId)
-        DeviceType.MaterialCabinet -> MaterialCabinetCommands(nodeId)
-        DeviceType.Unknown -> UnknownCommands(nodeId)
-    }
-
-    // ========= 类型定义 =========
-
-    /** 文档里的主控板类型（0/1/2/3），其余视为 Unknown */
-    enum class DeviceType(val code: Int) {
-        EKeyDock(0),          // 电子钥匙底座（左右位）
-        FiveLockDock(1),      // 5路挂锁底座（1..5位）
-        KeyCabinet(2),        // 钥匙柜控制板（多为5位同构，也可扩）
-        MaterialCabinet(3),   // 物资柜主控（支持RGB状态灯等）
-        Unknown(-1);
-
-        companion object {
-            fun fromCode(code: Int): DeviceType = when (code) {
-                0 -> EKeyDock
-                1 -> FiveLockDock
-                2 -> KeyCabinet
-                3 -> MaterialCabinet
-                else -> Unknown
-            }
-        }
+        /** 大多数设备复用的状态寄存器 (R) → 0x6010/0x00, 2B */
+        fun getStatus(nodeId: Int): SdoRequest.Read =
+            SdoRequest.Read(nodeId, 0x6010, 0x00)
     }
 
-    /** 各设备命令集统一接口（可按需加通用方法） */
-    interface CommandSet {
-        val nodeId: Int
-
-        /** 设备当前状态（大多数设备复用 0x6010/0x00, 2B），具体位义由各实现说明 */
-        fun getStatus(): SdoRequest.Read
-
-        /** 获取版本通用接口 */
-        fun getVersion(): SdoRequest.Read = Common.getDeviceVersion(nodeId)
-    }
+    /**
+     * 统一返回“通用命令集”（不做类型判断）
+     */
+    fun forDevice(nodeId: Int): GenericCommands = GenericCommands(nodeId)
 
-    // ========= 电子钥匙底座（左右位） =========
+    /** 通用命令集：把各家寄存器方法都放这（按需调用） */
+    class GenericCommands(val nodeId: Int) {
 
-    class EKeyDockCommands(override val nodeId: Int) : CommandSet {
-        /** 状态 (R) 0x6010/0x00, 2B
-         *  bit0:左卡扣, bit1:左充电, bit4:右卡扣, bit5:右充电，
-         *  bit8/9/12/13 工作位标识等（读侧用）
-         */
-        override fun getStatus(): SdoRequest.Read =
-            SdoRequest.Read(nodeId, 0x6010, 0x00)
+        // ---- EKeyDock（左右位）/ 以及很多板子兼容的 0x6011 语义 ----
 
-        /** 读/写 控制/状态 (R/W) 0x6011/0x00, 2B（写：仅置相关位，其余位写0） */
+        /** 控制/状态 (R/W) 0x6011/0x00, 2B：写仅置相关位，其余写0；读回含工作位 */
         fun readControlReg(): SdoRequest.Read =
             SdoRequest.Read(nodeId, 0x6011, 0x00)
 
-        /** 设置左右卡扣（写 0x6011） */
+        /** 设置左右卡扣（bit0=左卡扣，bit4=右卡扣） */
         fun setLatch(left: Boolean? = null, right: Boolean? = null): SdoRequest.Write {
             var v = 0
             if (left != null) v = v or ((if (left) 1 else 0) shl 0)
             if (right != null) v = v or ((if (right) 1 else 0) shl 4)
-            return SdoRequest.Write(nodeId, 0x6011, 0x00, shortLE(v), 2)
+            return SdoRequest.Write(nodeId, 0x6011, 0x00, shortLE(0b0001_0001, v), 2)
         }
 
-        /** 设置左右充电（写 0x6011） */
+        /** 设置左右充电（bit1=左充电，bit5=右充电） */
         fun setCharge(leftOn: Boolean? = null, rightOn: Boolean? = null): SdoRequest.Write {
             var v = 0
             if (leftOn != null) v = v or ((if (leftOn) 1 else 0) shl 1)
             if (rightOn != null) v = v or ((if (rightOn) 1 else 0) shl 5)
-            return SdoRequest.Write(nodeId, 0x6011, 0x00, shortLE(v), 2)
+            return SdoRequest.Write(nodeId, 0x6011, 0x00, shortLE(0b0010_0010, v), 2)
         }
 
         /** 单侧卡扣语法糖：keySlotId: 0左/1右；status: 0解锁/1锁住 */
@@ -126,74 +74,41 @@ object CanCommands {
             require(keySlotId in 0..1) { "keySlotId must be 0(left)/1(right)" }
             require(status == 0 || status == 1) { "status must be 0/1" }
             val bit = if (keySlotId == 0) 0 else 4
-            return SdoRequest.Write(nodeId, 0x6011, 0x00, shortLE((status and 1) shl bit), 2)
+            return SdoRequest.Write(
+                nodeId,
+                0x6011,
+                0x00,
+                shortLE(1 shl bit, (status and 1) shl bit),
+                2
+            )
         }
 
-        /** 左/右 RFID (R) 4B 小端 */
+        /** 左/右 RFID (R) 4B 小端（常见地址） */
         fun getLeftRfid(): SdoRequest.Read = SdoRequest.Read(nodeId, 0x6020, 0x00)
         fun getRightRfid(): SdoRequest.Read = SdoRequest.Read(nodeId, 0x6024, 0x00)
-    }
-
-    // ========= 5 路挂锁底座（1..5位） =========
-
-    class FiveLockDockCommands(override val nodeId: Int) : CommandSet {
-        /** 锁位状态 (R) 0x6010/0x00, 2B: bit0..bit4 对应 1..5 号位已锁 */
-        override fun getStatus(): SdoRequest.Read =
-            SdoRequest.Read(nodeId, 0x6010, 0x00)
 
-        /** 控制/状态 (R/W) 0x6011/0x00, 2B：写 bit0..bit4 控制 1..5 号位 */
-        fun readControlReg(): SdoRequest.Read =
-            SdoRequest.Read(nodeId, 0x6011, 0x00)
+        // ---- FiveLock / KeyCabinet（常见 1..5 位同构写法，寄存器通常与 0x6011 兼容） ----
 
-        /** 一次写入 5 位控制（低5位有效） */
-        fun setLatchBits(bits01to05: Int): SdoRequest.Write {
+        /** 一次写入 5 位控制（低5位有效），适配 5路/柜体同构 */
+        fun setLatchBits_1to5(bits01to05: Int): SdoRequest.Write {
             val v = bits01to05 and 0b1_1111
-            return SdoRequest.Write(nodeId, 0x6011, 0x00, shortLE(v), 2)
+            return SdoRequest.Write(nodeId, 0x6011, 0x00, shortLE(0b1_1111, v), 2)
         }
 
         /** 单位控制（1..5） */
-        fun controlOne(slotIndex1to5: Int, locked: Boolean): SdoRequest.Write {
+        fun controlOne_1to5(slotIndex1to5: Int, locked: Boolean): SdoRequest.Write {
             require(slotIndex1to5 in 1..5) { "slotIndex must be 1..5" }
             val v = (if (locked) 1 else 0) shl (slotIndex1to5 - 1)
-            return SdoRequest.Write(nodeId, 0x6011, 0x00, shortLE(v), 2)
+            return SdoRequest.Write(nodeId, 0x6011, 0x00, shortLE(1 shl (slotIndex1to5 - 1), v), 2)
         }
 
-        /** 各位 RFID (R) 0x6020..0x6024 /0x00, 4B 小端 */
-        fun getSlotRfid(slotIndex1to5: Int): SdoRequest.Read {
+        /** 1..5 位 RFID 常见映射：0x6020..0x6024 */
+        fun getSlotRfid_1to5(slotIndex1to5: Int): SdoRequest.Read {
             require(slotIndex1to5 in 1..5) { "slotIndex must be 1..5" }
             return SdoRequest.Read(nodeId, 0x6020 + (slotIndex1to5 - 1), 0x00)
         }
-    }
-
-    // ========= 钥匙柜控制板（通常与 FiveLock 类似，保留扩展位） =========
-
-    class KeyCabinetCommands(override val nodeId: Int) : CommandSet {
-        /** 状态 (R) 0x6010/0x00（实现与 FiveLock 类似，具体位义按柜体定义） */
-        override fun getStatus(): SdoRequest.Read =
-            SdoRequest.Read(nodeId, 0x6010, 0x00)
 
-        /** 控制/状态 (R/W) 0x6011/0x00，低5位通常对应 1..5 号位 */
-        fun setLatchBits(bits01to05: Int): SdoRequest.Write =
-            SdoRequest.Write(nodeId, 0x6011, 0x00, shortLE(bits01to05 and 0b1_1111), 2)
-
-        fun controlOne(slotIndex1to5: Int, locked: Boolean): SdoRequest.Write {
-            require(slotIndex1to5 in 1..5) { "slotIndex must be 1..5" }
-            val v = (if (locked) 1 else 0) shl (slotIndex1to5 - 1)
-            return SdoRequest.Write(nodeId, 0x6011, 0x00, shortLE(v), 2)
-        }
-
-        fun getSlotRfid(slotIndex1to5: Int): SdoRequest.Read {
-            require(slotIndex1to5 in 1..5) { "slotIndex must be 1..5" }
-            return SdoRequest.Read(nodeId, 0x6020 + (slotIndex1to5 - 1), 0x00)
-        }
-    }
-
-    // ========= 物资柜主控（RGB 状态灯等） =========
-
-    class MaterialCabinetCommands(override val nodeId: Int) : CommandSet {
-        /** 柜体状态 (R) 如需另定寄存器再扩展；暂复用 0x6010 */
-        override fun getStatus(): SdoRequest.Read =
-            SdoRequest.Read(nodeId, 0x6010, 0x00)
+        // ---- MaterialCabinet（RGB/温湿度扩展） ----
 
         /** RGB 状态灯 (R/W) 0x6016/0x00, 4B: B[0..7],G[8..15],R[16..23], 模式[24..26], 时间[27..29], 单位[30], 锁定[31] */
         fun getRgb(): SdoRequest.Read = SdoRequest.Read(nodeId, 0x6016, 0x00)
@@ -221,20 +136,18 @@ object CanCommands {
             return SdoRequest.Write(nodeId, 0x6016, 0x00, intLE(v), 4)
         }
 
-        /** 板载温湿度 (R) 2B，小端；温度有符号/10，湿度无符号/10 */
+        /** 温湿度（常见扩展） */
         fun getTemperature(): SdoRequest.Read = SdoRequest.Read(nodeId, 0x6017, 0x00)
         fun getHumidity(): SdoRequest.Read = SdoRequest.Read(nodeId, 0x6018, 0x00)
-    }
 
-    // ========= 未知类型占位，防空指针 =========
-    class UnknownCommands(override val nodeId: Int) : CommandSet {
-        override fun getStatus(): SdoRequest.Read =
-            SdoRequest.Read(nodeId, 0x6010, 0x00)
+        // ---- 通用状态 ----
+        fun getStatus(): SdoRequest.Read = Common.getStatus(nodeId)
+        fun getVersion(): SdoRequest.Read = Common.getDeviceVersion(nodeId)
     }
 
     // ========= Byte 打包工具（LE） =========
-    private fun shortLE(v: Int): ByteArray =
-        byteArrayOf((v and 0xFF).toByte(), ((v ushr 8) and 0xFF).toByte())
+    private fun shortLE(control: Int, target: Int): ByteArray =
+        byteArrayOf((target and 0xFF).toByte(), (control and 0xFF).toByte())
 
     private fun intLE(v: Int): ByteArray = byteArrayOf(
         (v and 0xFF).toByte(),

data/src/main/java/com/grkj/data/hardware/can/CanHelper.kt

@@ -28,12 +28,12 @@ object CanHelper {
     /**
      * 节点对应的设备类型列表
      */
-    private val nodeMap: HashMap<Int, CanCommands.DeviceType> = hashMapOf()
+    private val nodeMap: HashMap<Int, CanCommands.GenericCommands> = hashMapOf()
 
     /**
      * 扫描节点范围
      */
-    private val scanRange: IntRange = 1..4
+    private val scanRange: IntRange = 1..2
 
     /**
      * 连接
@@ -48,28 +48,10 @@ object CanHelper {
         ProtocolManager.connect(CustomCanConfig.instance.deviceId)
     }
 
-    /**
-     * 检查节点
-     */
-    fun checkNode() {
-        for (i in scanRange) {
-            readFrom(CanCommands.Common.getDeviceType(i)) {
-                nodeMap[i] = CanCommands.Common.parseDeviceType(it.payload)
-            }
-        }
-    }
-
-    /**
-     * 根据节点id获取设备类型
-     */
-    fun getDeviceType(nodeId: Int): CanCommands.DeviceType {
-        return nodeMap[nodeId] ?: CanCommands.DeviceType.Unknown
-    }
-
     /**
      * 根据设备类型获取节点id
      */
-    fun getNodeIdByDeviceType(deviceType: CanCommands.DeviceType): List<Int> {
+    fun getNodeIdByDeviceType(deviceType: CanCommands.GenericCommands): List<Int> {
         return nodeMap.filter { it.value == deviceType }.map { it.key }
     }
 

data/src/main/java/com/grkj/data/local/database/ISCSMigrations.kt

@@ -1,6 +1,8 @@
 package com.grkj.data.local.database
 
 import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.sqlite.execSQL
 
 
 /**
@@ -10,10 +12,21 @@ object ISCSMigrations {
     /**
      * 版本号
      */
-    const val VERSION = 1
+    const val VERSION = 2
 
     /**
      * 升级数据
      */
-    val migrationData: Array<Migration> by lazy { arrayOf() }
+    val migrationData: Array<Migration> by lazy {
+        arrayOf(MIGRATION_1_2)
+    }
+
+    private val MIGRATION_1_2 = object : Migration(1, 2) {
+        override fun migrate(database: SupportSQLiteDatabase) {
+            database.execSQL("CREATE TABLE IF NOT EXISTS `is_workstation` (`workstation_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `workstation_code` TEXT, `workstation_name` TEXT NOT NULL, `workstation_type` TEXT, `parent_id` INTEGER, `ancestors` TEXT, `order_num` INTEGER, `status` TEXT, `del_flag` TEXT, `create_by` TEXT, `create_time` TEXT, `update_by` TEXT, `update_time` TEXT, `remark` TEXT)")
+            database.execSQL("CREATE TABLE IF NOT EXISTS `sys_menu` (`menu_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `menu_name` TEXT NOT NULL, `parent_id` INTEGER, `order_num` INTEGER, `path` TEXT, `component` TEXT, `query` TEXT, `is_frame` INTEGER, `is_cache` INTEGER, `menu_type` TEXT, `visible` TEXT, `status` TEXT, `perms` TEXT, `icon` TEXT, `create_by` TEXT, `create_time` TEXT, `update_by` TEXT, `update_time` TEXT, `remark` TEXT)")
+            database.execSQL("CREATE TABLE IF NOT EXISTS `sys_role_menu` (`role_id` INTEGER NOT NULL, `menu_id` INTEGER NOT NULL, PRIMARY KEY(`role_id`, `menu_id`))")
+            database.execSQL("CREATE TABLE IF NOT EXISTS `sys_role` (`role_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `role_name` TEXT NOT NULL, `role_key` TEXT NOT NULL, `role_sort` INTEGER NOT NULL, `data_scope` TEXT, `menu_check_strictly` INTEGER, `dept_check_strictly` INTEGER, `status` TEXT NOT NULL, `del_flag` TEXT, `mars_data_scope` TEXT, `create_by` TEXT, `create_time` TEXT, `update_by` TEXT, `update_time` TEXT, `remark` TEXT)")
+        }
+    }
 }

data/src/main/java/com/grkj/data/local/dos/SysRole.kt

@@ -3,9 +3,6 @@ package com.grkj.data.local.dos
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import com.grkj.data.utils.ExcelColumn
-import com.grkj.data.utils.ExcelIgnore
-import com.grkj.data.utils.ExcelSheet
 
 
 /**
@@ -13,13 +10,11 @@ import com.grkj.data.utils.ExcelSheet
  *
  * @author ruoyi
  */
-@ExcelSheet("role")
 @Entity(tableName = "sys_role")
 class SysRole : BaseBean() {
     /**
      * 角色ID
      */
-    @ExcelIgnore
     @PrimaryKey(autoGenerate = true)
     @ColumnInfo("role_id")
     var roleId: Long = 0
@@ -27,59 +22,50 @@ class SysRole : BaseBean() {
     /**
      * 角色名称
      */
-    @ExcelColumn("role_manage_role_name", order = 0)
     @ColumnInfo("role_name")
     var roleName: String = ""
 
     /**
      * 角色权限
      */
-    @ExcelColumn("role_manage_permission_string", order = 1)
     @ColumnInfo("role_key")
     var roleKey: String = ""
 
     /**
      * 角色排序
      */
-    @ExcelIgnore
     @ColumnInfo("role_sort")
     var roleSort: Int = 0
 
     /**
      * 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限）
      */
-    @ExcelIgnore
     @ColumnInfo("data_scope")
     var dataScope: String? = null
 
     /**
      * 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示）
      */
-    @ExcelIgnore
     @ColumnInfo("menu_check_strictly")
     var menuCheckStrictly: Int? = null
 
     /**
      * 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ）
      */
-    @ExcelIgnore
     @ColumnInfo("dept_check_strictly")
     var deptCheckStrictly: Int? = null
 
     /**
      * 角色状态（0正常 1停用）
      */
-    @ExcelColumn("status", order = 2)
     var status: String = "0"
 
     /**
      * 删除标志（0代表存在 2代表删除）
      */
-    @ExcelIgnore
     @ColumnInfo("del_flag")
     var delFlag: String? = "0"
 
-    @ExcelIgnore
     @ColumnInfo("mars_data_scope")
     var marsDataScope: String? = null
 

gradle/libs.versions.toml

@@ -10,11 +10,11 @@ material = "1.12.0"
 activity = "1.8.0"
 constraintlayout = "2.2.1"
 jetbrainsKotlinJvm = "2.0.21"
-sikextension = "1.1.66"
+sikextension = "1.1.67"
 sikcamera = "1.0.11"
 sikcronjob = "1.0.3"
 sikfontmanager = "1.0.2"
-sikcomm = "1.0.12"
+sikcomm = "1.0.13"
 avi_library = "2.1.5"
 brv = "1.6.1"
 androidautosize = "v1.2.1"