Merge remote-tracking branch 'origin/jxhcasrs' into jxhcasrs

lty

17 小时以前 01fa93b5dd9f20286ef8f22515caf55307f76a9d

 src/main/resources/application-prod.yml

@@ -63,7 +63,6 @@
  subject: integrationasrs
  publicAlias: publicCert
  storePass: public_zhongyang_123456789
  licensePath: license.lic
  publicKeysStorePath: publicCerts.keystore

# 下位机配置
@@ -122,4 +121,4 @@
    acctID: "647e849ab6fa0f"
    username: "llw"
    password: "666666"
    lcid: 2052
    lcid: 2052