jk-GitHub-coder 4 年之前
父節點
當前提交
2dbef2fc5d

+ 1 - 0
YijiaRestful/src/main/java/com/platform/yijia/controller/PosMachineController.java

@@ -651,6 +651,7 @@ public class PosMachineController {
         }
         StationClassStructure scs =new StationClassStructure();
         scs.setClassStructureNo(no);
+        scs.setStationId(stationId);
         //汇总班结数据将汇总的数据插入到汇总数据中
         StationClassStructure stationclass = stationClassStructureService.selectSummyClassStructure(scs);
         if(stationclass!=null){

+ 2 - 2
YijiaRestful/src/main/resources/application.yml

@@ -19,7 +19,7 @@ yijia:
     domainName: mp.huijy.net
     # 路径前缀 test:测试; api:生产一线;prod:生产二线; demo:演示;
     path:
-        global-prefix: test
+        global-prefix: demo
 
 
 # POS机登录解密密文密码
@@ -30,7 +30,7 @@ yijia:
 spring:
     datasource:
 #        url: jdbc:mysql://47.105.116.204:3306/jiaduoduo_db?useUnicode=true&characterEncoding=utf8&nullCatalogMeansCurrent=true&serverTimezone=GMT%2b8&useSSL=true
-        url: jdbc:mysql://115.28.211.17:3306/jiaduoduo_db_test?useUnicode=true&characterEncoding=utf8&nullCatalogMeansCurrent=true&serverTimezone=GMT%2b8&useSSL=true
+        url: jdbc:mysql://115.28.211.17:3306/jiaduoduo_db_demo?useUnicode=true&characterEncoding=utf8&nullCatalogMeansCurrent=true&serverTimezone=GMT%2b8&useSSL=true
         username: develop
         password: 1234.Abcd
         driver-class-name: com.mysql.cj.jdbc.Driver