Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915

# Conflicts:
#	dsk-system/src/main/java/com/dsk/system/service/impl/ISysTenantServiceImpl.java

dsk-operate-ui/src/layout/components/TagsView/index.vue

@@ -44,7 +44,7 @@
             <svg :class="isActive(tag)?'tags-icon tags-icon-active':'tags-icon'" aria-hidden="true">
               <use :xlink:href="iconName(tag)" />
             </svg>
-            <span :id="isActive(tag)?'tagTitle':''">{{ tag.title }}</span>
+            <span :id="isActive(tag)?'tagTitle':''">{{ tag.title.replace(/<[^>]+>/g, '') }}</span>
             <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
             <i :class="index!=visitedViews.length-1 && index != isActiveIndex() && index != isActiveIndex()-1?'tags-item-line':'tags-item-line item-color'" />
           </router-link>

dsk-operate-ui/src/views/detail.vue

@@ -37,7 +37,7 @@ export default {
       this.domain='https://plug.jiansheku.com'
     }else {
       this.domain='https://pre-plug.jiansheku.com'
-      this.domain='http://192.168.60.210:3400'
+      // this.domain='http://192.168.60.210:3400'
     }
     this.gettokens();
   },

dsk-operate-ui/src/views/enterpriseManagement/index.vue

@@ -221,7 +221,7 @@
       <p>温馨提示：此操作可能会影响正在使用的用户，建议合理安排同步时间</p>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible1 = false">取消</el-button>
-        <el-button type="primary" @click="handleConfirm()" >同步</el-button>
+        <el-button type="primary" @click="handleConfirm()" :loading="state">同步</el-button>
       </div>
     </el-dialog>
   </div>
@@ -305,7 +305,8 @@
         },
         //企业方案列表
         packageList:[],
-        syncItem:{}
+        syncItem:{},
+        state:false,
       };
     },
     created() {
@@ -390,8 +391,10 @@
       /** 同步按钮操作 */
       handleConfirm() {
         let _this = this
+        this.state=true
         syncTenantPackage({tenantId:this.syncItem.tenantId,packageId:this.syncItem.packageId}).then(res => {
           if(res.code === 200){
+            this.state=false
             _this.$message.success(res.msg);
             this.dialogVisible1=false;
           }

dsk-system/src/main/java/com/dsk/system/service/impl/ISysTenantServiceImpl.java

@@ -216,6 +216,7 @@ public class ISysTenantServiceImpl implements ISysTenantService {
         String password = PasswordUtils.generatePwd(8);
         user.setPassword(BCrypt.hashpw(password));
         user.setDeptId(deptId);
+        user.setCreateTime(new DateTime());
         userMapper.insert(user);
         //新增系统用户后，默认当前用户为部门的负责人
         SysDept sd = new SysDept();