From 351cd801ebf0da665c521448c978da100b4aaf03 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 05 十二月 2024 15:21:08 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/models/role_model.py | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/app/models/role_model.py b/app/models/role_model.py
index de18a04..520bd86 100644
--- a/app/models/role_model.py
+++ b/app/models/role_model.py
@@ -66,11 +66,26 @@
return json
+ def to_dict(self):
+ json = {
+ 'roleId': self.id,
+ 'createTime': self.created_at.strftime('%Y-%m-%d %H:%M:%S'),
+ 'updateTime': self.updated_at.strftime('%Y-%m-%d %H:%M:%S'),
+ 'roleName': self.name,
+ 'remark': self.description,
+ 'iconCls': self.iconCls,
+ 'roleSort': self.seq,
+ 'status': self.status,
+ 'roleKey': self.roleKey,
+ 'dataScope': self.dataScope
+ }
+ return json
+
class RoleData(BaseModel):
remark: Optional[str] = ""
roleName: str
roleKey: Optional[str] = ""
- dataScope: Optional[str] = ""
+ dataScope: Optional[int] = 0
class RoleStatus(BaseModel):
--
Gitblit v1.8.0