Merge branch 'alpha' of http://120.27.238.55:7000/r/beauty-erp into alpha

Helius

2022-06-09 d524c2c3f60032916218a638ee5fa610cd2a330c

 zq-erp/src/main/java/com/matrix/core/tools/DateUtil.java

@@ -720,7 +720,7 @@
                targetDate = calendar.getTime();
                break;
            default:
                targetDate = stringToDate("9999-12-31", DATE_FORMAT_DD);
                targetDate = stringToDate("2099-12-31", DATE_FORMAT_DD);

        }