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

peng

8 天以前 127a0f6ab38866d0b05b32d2102cc85638a06e62

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

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