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

chenlu

2024-05-30 4ee53f8b43e850d2b35d5b1eb979d7b0bc2fbcd4

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

}