Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

 Conflicts:

	ruoyi-ui/package.json

	ruoyi-ui/src/api/system/config.js

	ruoyi-ui/src/api/system/dict/data.js

	ruoyi-ui/src/api/system/dict/type.js

	ruoyi-ui/src/assets/styles/element-variables.scss

	ruoyi-ui/src/components/SvgIcon/index.vue

	ruoyi-ui/src/layout/components/Sidebar/Link.vue

	ruoyi-ui/src/layout/components/Sidebar/index.vue

	ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue

	ruoyi-ui/src/layout/components/TagsView/index.vue

	ruoyi-ui/src/views/monitor/job/index.vue

	ruoyi-ui/src/views/system/config/index.vue

	ruoyi-ui/src/views/system/dept/index.vue

	ruoyi-ui/src/views/system/dict/data.vue

	ruoyi-ui/src/views/system/dict/index.vue

	ruoyi-ui/src/views/system/menu/index.vue

	ruoyi-ui/src/views/system/notice/index.vue

	ruoyi-ui/src/views/system/post/index.vue

	ruoyi-ui/src/views/system/role/index.vue

	ruoyi-ui/src/views/system/user/index.vue

	ruoyi-ui/src/views/system/user/profile/resetPwd.vue

	ruoyi-ui/src/views/system/user/profile/userAvatar.vue

	ruoyi-ui/src/views/system/user/profile/userInfo.vue

	ruoyi-ui/vue.config.js

	ruoyi/pom.xml

	ruoyi/src/main/java/com/ruoyi/common/constant/Constants.java

	ruoyi/src/main/java/com/ruoyi/common/utils/StringUtils.java

	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java

	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java

	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java

	ruoyi/src/main/java/com/ruoyi/project/system/service/ISysConfigService.java

	ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDictDataService.java

	ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDictTypeService.java

	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java

	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java

	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java

	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java

	ruoyi/src/main/resources/application.yml

	ruoyi/src/main/resources/vm/sql/sql.vm

	ruoyi/src/main/resources/vm/vue/index.vue.vm

ruoyi-ui/vue.config.js

@@ -82,12 +82,6 @@ module.exports = {
       })
       .end()
 
-    config
-      // https://webpack.js.org/configuration/devtool/#development
-      .when(process.env.NODE_ENV === 'development',
-        config => config.devtool('cheap-source-map')
-      )
-
     config
       .when(process.env.NODE_ENV !== 'development',
         config => {