Merge branch 'feature/mall_product' of https://gitee.com/lanxindx/ruoyi-vue-pro into feature/mall_product

# Conflicts:
#	yudao-server/src/main/resources/application-local.yaml
This commit is contained in:
YunaiV
2023-10-03 10:33:22 +08:00
32 changed files with 238 additions and 369 deletions

View File

@ -214,10 +214,6 @@ yudao:
enable: false
demo: false # 关闭演示模式
tencent-lbs-key: TVDBZ-TDILD-4ON4B-PFDZA-RNLKH-VVF6E # QQ 地图的密钥 https://lbs.qq.com/service/staticV2/staticGuide/staticDoc
clean-job:
access-retain-day: 7
error-retain-day: 8
job-clean-retain-day: 8
justauth:
enabled: true