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

nidapeng

2024-04-07 60732300b6f4e72a6d7d649bdada079dcd31cdb0

 server/shop/src/main/resources/application.yml

@@ -6,7 +6,7 @@
#  env: production
server:
#  port: 10022
  port: 10031
  port: 10032

spring:
#  application:git