Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

guoyuji

2024-04-25 205657134d435d84114c4bb7663c17d76575cbaa

 north-glass-erp/target/classes/application.yml

@@ -1,6 +1,7 @@

server:
  port: 8080
  port: 8086



spring:
@@ -28,4 +29,7 @@
          url: jdbc:mysql://10.153.19.150:3306/pp?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
          driver-class-name: com.mysql.cj.jdbc.Driver
#mybatis-plus:
#  configuration:
#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl