Merge branch 'develop'

king

2023-08-10 7b65909a89191830ceb45a54dbeac37561ffbe2f

 src/views/pcdesign/index.jsx

@@ -1440,7 +1440,6 @@
            message: '保存成功',
            duration: 2
          })
          MKEmitter.emit('completeSave')
        } else {
          notification.warning({
            top: 92,
@@ -1448,6 +1447,7 @@
            duration: 5
          })
        }
        MKEmitter.emit('completeSave')
      }, this.netError)
    }, 300 + (+sessionStorage.getItem('mkDelay')))
  }
@@ -1464,6 +1464,7 @@
        duration: 5
      })
    }
    MKEmitter.emit('completeSave')
  }

  getRoleFields = () => {