Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-04-08 7849d7799c9ede8447a4d57c26e032e08c1eff74

 zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java

@@ -40,8 +40,12 @@
    private String isInvalid;

    public String getIsInvalid() {
        Date date = DateUtil.nextNDate(new Date(), 7);
        Date date = DateUtil.getDateAfterMonth(new Date(), 1);
        if (invalidTime != null) {
            if (new Date().after(invalidTime)) {
                return "3";
            }

            if (date.after(invalidTime)) {
                return "1";
            }