update 修复合并异常

疯狂的狮子li

2021-09-26 770217513056ef60d5a10a705d8f75ca11d7d5af

1
2
3
4
5
6
7
8
9
10
11
server:
  port: 9090
 
spring:
  security:
    user:
      name: ruoyi
      password: 123456
  boot:
    admin:
      context-path: /admin