Merge branch 'master' into dinhdam

src/main/resources/application.properties

-server.port=8081
+#server.port=8081
 # ===============================
 # DATABASE CONNECTION
 # ===============================
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+<<<<<<< HEAD
+spring.datasource.url=jdbc:mysql://localhost:3306/quantrivanphong
+spring.datasource.username=root
+spring.datasource.password=ahihi123
+=======
 spring.datasource.url=jdbc:mysql://localhost:3308/quantrivanphong
 spring.datasource.username=root
 spring.datasource.password= 123456
+>>>>>>> f6b6b75d93f4b7ab7e92c4c2398ddcf0c0f812b4
 
 # ===============================
 # JPA / HIBERNATE
 # ===============================
 spring.jpa.show-sql=true
 spring.jpa.hibernate.ddl-auto=update
+<<<<<<< HEAD
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL57Dialect
+=======
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
 #spring.jpa.properties.hibernate.default_schema=qlns_itsol
+>>>>>>> f6b6b75d93f4b7ab7e92c4c2398ddcf0c0f812b4
 
 
 ## Fix Postgres JPA Error: