Merge branch 'master' into develop

zenglf

2023-09-28 8e75a78f55d60565eb48b25eafd4eb07939ce2cc

 src/views/system/DepartListSync.vue

@@ -269,9 +269,9 @@
        that.departTree = []
        //所有的树节点key信息
        that.allIds = []
        

        that.iExpandedKeys = []
        

        that.loading = false
        queryDepartTreeSync().then((res) => {
          if (res.success) {
@@ -356,7 +356,11 @@
      batchDel: function () {
        console.log(this.checkedKeys)
        if (this.checkedKeys.length <= 0) {
          this.$message.warning('请选择一条记录！')
          // this.$message.warning('请选择一条记录！')
          this.$notification.warning({
            message:'消息',
            description:"请选择一条记录"
          });
        } else {
          var ids = ''
          for (var a = 0; a < this.checkedKeys.length; a++) {