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


 Conflicts:

	ruoyi-ui/bin/package.bat

	ruoyi-ui/package.json

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

	ruoyi-ui/src/layout/components/Navbar.vue

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

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

	ruoyi-ui/src/router/index.js

	ruoyi-ui/src/views/components/icons/element-icons.js

	ruoyi-ui/src/views/dashboard/mixins/resize.js

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

	ruoyi/src/main/java/com/ruoyi/common/filter/XssFilter.java

	ruoyi/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java

	ruoyi/src/main/java/com/ruoyi/common/utils/text/CharsetKit.java

	ruoyi/src/main/java/com/ruoyi/common/utils/text/Convert.java

	ruoyi/src/main/java/com/ruoyi/common/utils/text/StrFormatter.java

	ruoyi/src/main/java/com/ruoyi/framework/config/FilterConfig.java

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

	ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysNoticeMapper.java

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

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

	ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java

	ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java

	ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java