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

admin

2020-04-30 feee59af9b9d8173e28d7cde588b1ef9fcdb7efd

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

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

@@ -652,8 +652,6 @@
                }

            }

            

			
			


            long count = 0;

            if (type == 0) {


 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java

@@ -163,7 +163,11 @@
            if (record.getStartTime() != null && record.getEndTime().getTime() <= record.getStartTime().getTime())
                throw new GoodsEvaluateException(1, "截止时间必须大于开始时间");
        } else {
            record.setEndTime(DateUtil.plusDayDate(3, new Date()));
            if (record.getStartTime() == null) {
                record.setEndTime(DateUtil.plusDayDate(3, new Date()));
            } else {
                record.setEndTime(DateUtil.plusDayDate(3, record.getStartTime()));
            }
        }

        Integer dynamicType = record.getDynamicType();