Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2024-11-08 b0c0f18e390e729817c97ca2b375a2fd1e2ed9a1

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

}