Merge remote-tracking branch 'origin/master' into master_develop

yujian

2019-05-13 ca81ac257960fcb135fe542a49c28bc871b14e2a

 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)) {