From 3037ddc8c6e0519a9e1ae6d0a9cc002033047a02 Mon Sep 17 00:00:00 2001
From: Administrator <3174665893@qq.com>
Date: 星期六, 09 十一月 2024 15:59:55 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025
---
common.h | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/common.h b/common.h
index a2d50a7..022d89f 100644
--- a/common.h
+++ b/common.h
@@ -630,7 +630,7 @@
Head head;
int status;
CoaMinRod coaMinRod[0];
- CoaMinRodReS(){
+ CoaMinRodRes(){
head.type = COAL_MINE_RODER_RES;
head.len = sizeof(CoaMinRodReS);
}
@@ -745,10 +745,17 @@
struct MonoutputInfo
{
+<<<<<<< HEAD
+ char month[32];//鏈堜唤
+ double aOutput;//a浜у搧鏈堜骇閲�
+ double bOutput;//b浜у搧鏈堜骇閲�
+ double cOutput;//c浜у搧鏈堜骇閲�
+=======
char date[32];//日期
double aOutput;//a产品月产量
double bOutput;//b产品月产量
double cOutput;//c产品月产量
+>>>>>>> 83817169914cd859e4a7e0b5f0685dd0c072a974
};
//添加生产计划的请求结构体
@@ -760,7 +767,7 @@
head.type = ADD_PDPLAN_REQ;
head.len = sizeof(AddPdplanReq);
}
-}
+};
//添加一条生产计划的响应结构体
struct AddPdplanRes
{
--
Gitblit v1.8.0