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

guoyujie

2025-05-30 5829472d87716ee7301474e97de2da25ed05de35

 north-glass-erp/src/test/java/com/example/erp/ErpApplicationTests.java

@@ -11,4 +11,9 @@
        String.valueOf("1.0").replaceAll("\\.0*$|(\\.\\d*?)0+$", "$1");
    }

    @Test
    void test() {

    }

}