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

guoyuji

2024-07-12 40c71665c39423120973349edfd76d07ab27a15e

 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");
    }

}