Merge remote-tracking branch 'origin/div' into div

admin

2019-08-29 b99a10cff6b4c4d0965871be894fba8ba64605fc

 fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskRecordServiceImpl.java

@@ -290,7 +290,7 @@


         if (num <= 0)

            num = 1;

         String title = taskClass.getName() + "-" + integralTask.getName() + "-" + num + "次";

         String title = taskClass.getName() + "-" + integralTask.getName() + "-第" + num + "次";

         detail.setTitle(title);

      }