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

chenlu

2024-12-05 a8557c74bba5f4f7ff9b2f3c9d84db5d24bb43cd

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

}