Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

client/src/views/OaSystem/mineCenter/components/leftInfo.vue

@@ -168,7 +168,7 @@ onMounted(() => {})
 
   .infoContent {
     width: 100%;
-    height: 100%;
+    height: calc(100% - 165px);
     margin-top: 165px;
 
     .contentBox {
@@ -239,7 +239,7 @@ onMounted(() => {})
 
     .contentList {
       width: 100%;
-      height: calc(100% - 345px);
+      height: calc(100% - 140px);
       overflow-y: auto;
 
       ul {

client/src/views/OaSystem/oaLayout/tagList.vue

@@ -2,7 +2,7 @@
   <div class="_tagList">
     <div class="tag-view">
       <el-icon
-        class="arrow-btn"
+        class="arrow-btn arrow-btn-left"
         v-show="showListContainerArrow"
         :size="20"
         @click="handleTagListScroll('left')"
@@ -118,16 +118,16 @@
         </template>
       </draggable>
       <el-icon
-        class="arrow-btn"
+        class="arrow-btn arrow-btn-right"
         v-show="showListContainerArrow"
         :size="20"
         @click="handleTagListScroll('right')"
       >
         <DArrowRight />
       </el-icon>
-      <div v-if="(visitedViews?.length ?? 0) > 1" class="all-tags-close" @click="allTagsClose">
-        关闭全部
-      </div>
+      <!--      <div v-if="(visitedViews?.length ?? 0) > 1" class="all-tags-close" @click="allTagsClose">-->
+      <!--        关闭全部-->
+      <!--      </div>-->
     </div>
   </div>
 </template>
@@ -316,15 +316,16 @@ onMounted(() => {
     align-items: center;
     width: 100%;
     height: 100%;
-    padding-right: 10px;
+    //padding-right: 10px;
 
     .arrow-btn {
+      height: 100%;
       cursor: pointer;
     }
 
     .tags-draggable-list {
       overflow-x: auto;
-      width: calc(100% - 64px);
+      width: 100%;
       height: 100%;
       display: flex;
       padding-top: 6px;

zjugis-module-system/zjugis-module-system-biz/src/main/java/com/zjugis/module/system/service/user/AdminUserServiceImpl.java

@@ -59,7 +59,7 @@ import static com.zjugis.module.system.enums.ErrorCodeConstants.*;
 @Slf4j
 public class AdminUserServiceImpl implements AdminUserService {
 
-    @Value("${sys.user.init-password:zjugisyuanma}")
+    @Value("${sys.user.init-password:123456}")
     private String userInitPassword;
 
     @Resource