Pre Merge pull request !220 from Mr.Gong/N/A

Merge pull request !397 from 威士忌的纯度/N/A

docker/nginx/conf/nginx.conf

@@ -29,7 +29,7 @@ http {
         }
 
         # 避免actuator暴露
-        if ($request_uri ~ "/actuator") {
+        if ($uri ~ "/actuator") {
             return 403;
         }
 

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java

@@ -49,9 +49,6 @@ public class SysDept extends BaseEntity
     /** 删除标志（0代表存在 2代表删除） */
     private String delFlag;
     
-    /** 父部门名称 */
-    private String parentName;
-    
     /** 子部门 */
     private List<SysDept> children = new ArrayList<SysDept>();
 
@@ -161,16 +158,6 @@ public class SysDept extends BaseEntity
         this.delFlag = delFlag;
     }
 
-    public String getParentName()
-    {
-        return parentName;
-    }
-
-    public void setParentName(String parentName)
-    {
-        this.parentName = parentName;
-    }
-
     public List<SysDept> getChildren()
     {
         return children;