Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs
# Conflicts:
# src/main/java/com/zy/asrs/controller/MatCodeController.java
# src/main/java/com/zy/asrs/utils/VersionUtils.java
# src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
# src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
# src/main/resources/application.yml
| | |
|---|
| | | // generator.table="sys_host"; |
|---|
| | | // sqlserver |
|---|
| | | generator.sqlOsType = SqlOsType.SQL_SERVER; |
|---|
| | | generator.url="localhost:1433;databasename=jkasrs"; |
|---|
| | | generator.url="192.168.4.15:1433;databasename=gzynasrs"; |
|---|
| | | generator.username="sa"; |
|---|
| | | generator.password="sa@123"; |
|---|
| | | generator.table="asr_wrkin_count_view"; |
|---|
| | | generator.table="asr_test_mast"; |
|---|
| | | generator.packagePath="com.zy.asrs"; |
|---|
| | | generator.build(); |
|---|
| | | } |
|---|
