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

guoyuji

2024-02-27 900b4223386a8010e80f1091c4371c19e9117d63

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

}