Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	.idea/workspace.xml

.gitignore

@@ -1,3 +1,14 @@
 .idea/misc.xml
 .idea/modules.xml
 .idea/workspace.xml
+### Example user template template
+### Example user template
+
+# IntelliJ project files
+.idea
+*.iml
+out
+gen
+/.idea/misc.xml
+/.idea/modules.xml
+/.idea/workspace.xml

ys_vue/src/views/base/role.vue

@@ -217,7 +217,6 @@
 			addSubmit: function () {
 				this.$refs.addForm.validate((valid) => {
 					if (valid) {
-                        console.log(this.addForm)
                         var _this = this;
                         this.addLoading = true;
                         this.http.post(this.port.base.addRole, {
@@ -231,7 +230,7 @@
                             this.addLoading = false;
                             if (res.code == "ok") {
                                 this.$message({
-                                    message: '恭喜你，这是一条成功消息',
+                                    message: '创建成功',
                                     type: 'success'
                                 });
                                 this.getUsers();