chore:7月25日

aehyok · Jul 25, 2024 · 2408bc6 · 2408bc6
1 parent 734c4d7
commit 2408bc6
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/docs/javascript/2022-05-07-git.md b/docs/javascript/2022-05-07-git.md
@@ -286,6 +286,9 @@
         // 将当前代码状态暂时切换WIP
         git stash save '备注'
         // 执行后 Saved working directory and index state WIP on dev: b4d9dc5 feat: 合并行和列
+        
+        //要将工作目录下的所有变更保存到一个新的WIP stash中，包括未跟踪的文件
+        git stash -u
 
         // 想恢复的话需要切换到之前的分支，然后再执行
         // 应用最近一次的stash
@@ -297,7 +300,7 @@
 
 
         //如果stash了多次,可通过list命令列出所有的stash
-        git stash list 
+        git stash list
 
         // 如果都恢复完毕 可以使用clear进行清除
         git stash clear

diff --git a/docs/javascript/2024-07-24-query.md b/docs/javascript/2024-07-24-query.md
@@ -0,0 +1,26 @@
+## 菜单
+
+```
+## 先通过root 获取根菜单
+select * from md_sysparameters s where s.name like '%root%' and systemid='dev'
+
+## 然后再通过MenuID获取下级菜单
+select * from md_sysparameters s where s.`name` like '%90000' and systemid='dev'
+```
+
+## 数据导入菜单
+```
+{
+    "MenuID": "60000",
+    "MenuTitle": "乡村摸底调查数据导入",
+    "DisplayOrder": 25,
+    "FatherID": "0",
+    "IconName": "",
+    "MenuType": "LoadFromServer",
+    "MenuParameter": "",
+    "CanUse": true,
+    "Level": 1,
+    "IconIndex": "-1",
+    "Children": []
+}
+```