Merge remote-tracking branch 'origin/master'

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

@@ -161,6 +161,12 @@ var indexVue = new Vue({
 						    			});
 					    				//删除成功，刷新列表
 					      				that.list();
+					      			}else {
+										that.$notify({
+											title: '失败',
+											message: res.msg,
+											type: 'warning'
+										});
 									}
 	            				});
 					    }).catch(() => {

src/main/webapp/WEB-INF/manager/cms/content/main.ftl

@@ -225,6 +225,12 @@
                                 });
                                 //删除成功，刷新列表
                                 that.list();
+                            }else {
+                                that.$notify({
+                                    title: '失败',
+                                    message: res.msg,
+                                    type: 'warning'
+                                });
                             }
                         });
                 }).catch(() => {