Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-majoys into dev

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/scequipment/ScEquipmentMapper.java

@@ -42,7 +42,7 @@ public interface ScEquipmentMapper extends BaseMapperX<ScEquipmentDO> {
     @Options(statementType = StatementType.CALLABLE)
     List<ScDashboardResVO> getFaultTimeInfo(ScDashboardReqVO reqVO);
 
-    @Select("CALL Equipment()")
+    @Select("CALL Equipment")
     @Options(statementType = StatementType.CALLABLE)
-    void generateLiveDataOfEquipment();
+    List<ScEquipmentDO> generateLiveDataOfEquipment();
 }

mes-server/src/main/resources/application-pro.yaml

@@ -221,7 +221,7 @@ chanjet:
     gatewayUrl: https://openapi.chanjet.com #开放平台网关地址
     connectTimeout: 3000 #连接超时时间，单位ms
     readTimeout: 15000 #读取超时时间，单位ms
-    appKey: fZtARspH #需要填写在开放平台申请的appKey
-    appSecret: B071433DABBE48DB2241AE12280C8CBC #需要填写在开放平台申请的appSecret
+    appKey: 4fwVPgzS #需要填写在开放平台申请的appKey
+    appSecret: 10A472641CDA5FB08ABA7178B190C7C5 #需要填写在开放平台申请的appSecret
     secret: 1234567890123456 #秘钥，用于解密，需要去开放平台自主填写，然后配置在此处
     redirectUri: http://222.71.165.187:9031/admin-api/biz/chanjet/receiveCode #Oauth重定向地址，需要去开放平台自主填写，然后配置在此处