Merge remote-tracking branch 'origin/master'

src/main/webapp/WEB-INF/manager/cms/category/form.ftl

@@ -378,7 +378,7 @@
                 this.rules.categoryPinyin =  [{
                     "validator": this.validatorCategoryPinyin, trigger: 'blur'
                 }, {
-                    "pattern": /^[^[!@#$"'%^&*()_+-/~?！@#￥%…&*（）——+—？》《：“‘’]+$/,
+                    "pattern": /^[^[!@#$"'%^&*()_+-/~?！\\、@#￥%…&*（）——+—？》《：“‘’\s]+$/,
                     "message": "拼音格式不匹配"
                 }];
                 if (this.regularCheck(regu, n)) {