Merge branch 'master' into 'fwl'

# Conflicts:
#   .gitignore

.gitignore

-node_modules/
+# Created by .ignore support plugin (hsz.mobi)
\ No newline at end of file
+### Java template
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+node_modules
\ No newline at end of file

src/views/modules/meeting/meeting-add-or-update.vue

@@ -45,7 +45,7 @@ export default {
         ],
         content: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
+        ]
       }
     }
   },