update 修复合并异常

疯狂的狮子li

2021-09-26 c2e43cc7817174c42b8cbe205d8e38329fe28749

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