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

admin

2019-11-13 221b5c8d0de3f6b17a00d543503a79c13b28ba12

 fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java

@@ -138,8 +138,8 @@
    */

   @Scheduled(cron = "0 1 5 * * ? ")

   public void autoAddTLJBuyGoods2() {

      if (!Constant.IS_TASK)

         return;

      // if (!Constant.IS_TASK)

      // return;

      LogHelper.test("自购立减开始选品");

      String day = TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd");

      // 重试3次