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

zxl

3 天以前 d33b041f4b2a63a22682c9b3f344ef35f84b4542

 seller-api/src/main/resources/application.yml

@@ -265,6 +265,6 @@
      appname: xxl-job-executor-lilishop
      address:
      ip:
      port: 8891
      port: 8848
      logpath: ./xxl-job/executor
      logretentiondays: 7