diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index a3291bc..cfa4751 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -5,14 +5,14 @@ spring: driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver druid: # 主库数据源 -# master: -# url: jdbc:sqlserver://192.168.1.120:1433;SelectMethod=cursor;DatabaseName=ATJ_581_DB -# username: sa -# password: 123456 master: - url: jdbc:sqlserver://119.45.202.115:1433;SelectMethod=cursor;DatabaseName=ATJ_581_DB + url: jdbc:sqlserver://192.168.1.120:1433;SelectMethod=cursor;DatabaseName=ATJ_581_DB username: sa - password: haiwei@123 + password: 123456 +# master: +# url: jdbc:sqlserver://119.45.202.115:1433;SelectMethod=cursor;DatabaseName=ATJ_581_DB +# username: sa +# password: haiwei@123 # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/ProRpList/SelectProRpList.html b/ruoyi-admin/src/main/resources/templates/nanjing/ProRpList/SelectProRpList.html index 0419842..6fcf5de 100644 --- a/ruoyi-admin/src/main/resources/templates/nanjing/ProRpList/SelectProRpList.html +++ b/ruoyi-admin/src/main/resources/templates/nanjing/ProRpList/SelectProRpList.html @@ -100,7 +100,7 @@ title: '系统条码' }, { - field: 'SerialNo', + field: 'serialNo', title: '序列号' }, {