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

guoyuji

2024-03-22 81df1dcdb77b01b4a957b2b0725f3a91cfc0f72a

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

}