Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyuji

2024-07-11 cc6c23214508017230f9166cff4a64da4e339867

 north-glass-erp/src/test/java/com/example/erp/ErpApplicationTests.java

@@ -8,6 +8,7 @@

    @Test
    void contextLoads() {
        String.valueOf("1.0").replaceAll("\\.0*$|(\\.\\d*?)0+$", "$1");
    }

}