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

guoyuji

2024-07-22 074b0f269121090ea7a9e9c1df03023528122727

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

}