Merge remote-tracking branch 'origin/2.0' into 2.0

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

 cloud-server-other/src/main/java/com/dsh/OtherApplication.java

@@ -30,7 +30,9 @@
    public static void main(String[] args) {
        try {
            SpringApplication.run(OtherApplication.class, args);
        }catch (Exception e){e.printStackTrace();}
        } catch (Exception e) {
            e.printStackTrace();
        }
    }

    @Bean