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

jiaosong

2023-09-21 2193f1e8240e2a0ed5900dddc6347a1d9db081cf

 server/pom.xml

@@ -13,6 +13,7 @@
    <module>platform</module>
    <module>service</module>
    <module>company</module>
    <module>zhubo</module>
  </modules>

  <parent>