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

nidapeng

2024-04-07 241867ae64ccfe5bf61bd5e939af1f308ca1e3b3

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

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

spring:
#  application:git