Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into dat...

wzy

2021-04-24 1a20adbee4043a7b4a9e51565e7ac0f99d06c36d

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

@@ -43,8 +43,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";
            }