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

guoyujie

2025-09-03 b6831163ebaefff36901a100faae6dcf538b1215

 north-glass-erp/src/main/java/com/example/erp/ErpApplication.java

@@ -15,10 +15,10 @@
public class ErpApplication {
    public static void main(String[] args) {
        SpringApplication.run(ErpApplication.class, args);
        try {
        /*try {
            new NettyServer(12345).start();
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
        }*/
    }
}