Merge remote-tracking branch 'origin/master'

yujian

2019-07-11 8a7a7e79b63d91d1865bdf2ec38d4e99d2670d69

 fanli/src/main/java/com/yeshi/fanli/controller/admin/LableAdminController.java

@@ -61,7 +61,6 @@
    */

   @RequestMapping(value = "saveAdd")

   public void saveAdd(String callback, Long uid, Label label, HttpServletRequest request, PrintWriter out) {



      try {

         String title = label.getTitle();

         if (StringUtil.isNullOrEmpty(title)) {