diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesWorkCellScanMonitorLogController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesWorkCellScanMonitorLogController.java
index 5e8fe35..747bf61 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesWorkCellScanMonitorLogController.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesWorkCellScanMonitorLogController.java
@@ -13,8 +13,7 @@ import cn.estsh.impp.framework.boot.util.ResultBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -35,9 +34,9 @@ public class MesWorkCellScanMonitorLogController extends BaseController {
     @Autowired
     private IMesWorkCellScanMonitorLogService workCellScanMonitorLogService;
 
-    @PostMapping(value = "/ext/work-cell-scan-monitor-log/report/query")
+    @GetMapping(value = "/ext/work-cell-scan-monitor-log/report/query")
     @ApiOperation(value = "查询工位扫描日志合并设备日志报表")
-    public ResultBean queryWorkCellScanMonitorLogList(@RequestBody MesWorkCellScanMonitorConditionModel conditionModel) {
+    public ResultBean queryWorkCellScanMonitorLogList(MesWorkCellScanMonitorConditionModel conditionModel) {
         try {
             conditionModel.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode());
             List<MesWorkCellScanMonitorLogModel> result = workCellScanMonitorLogService.queryWorkCellScanMonitorLogList(conditionModel);
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesWorkCellMonitorLogService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesWorkCellMonitorLogService.java
index 43bbe9b..0e2c291 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesWorkCellMonitorLogService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesWorkCellMonitorLogService.java
@@ -121,14 +121,13 @@ public class MesWorkCellMonitorLogService implements IMesWorkCellScanMonitorLogS
             if (null == wcEquipment) continue;
 
             if (logTypes.contains(MesEnumUtil.WORK_CELL_SCAN_MONITOR_LOG_TYPE.EQU.getValueStr())) {
-                MesWorkCellScanMonitorConditionModel equConditionModel = new MesWorkCellScanMonitorConditionModel().flag(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()).copy(conditionModel).location(wcEquipment);
+                MesWorkCellScanMonitorConditionModel equConditionModel = new MesWorkCellScanMonitorConditionModel().copy(conditionModel).location(wcEquipment).flag(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
                 if (StringUtils.isEmpty(conditionModel.getEquipId())) equConditionModel.equipId(getEquipId(conditionModel.getOrganizeCode(), wcEquipment.getEquipmentCode()));
                 conditionModelList.add(equConditionModel);
             }
 
             if (!CollectionUtils.isEmpty(monitorLogTypes)){
-                conditionModelList.add(new MesWorkCellScanMonitorConditionModel().
-                        flag(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()).copy(conditionModel).location(wcEquipment).logTypeList(MesEnumUtil.WORK_CELL_SCAN_MONITOR_LOG_TYPE.collectMonitorValues(monitorLogTypes)));
+                conditionModelList.add(new MesWorkCellScanMonitorConditionModel().copy(conditionModel).location(wcEquipment).flag(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()).logTypeList(MesEnumUtil.WORK_CELL_SCAN_MONITOR_LOG_TYPE.collectMonitorValues(monitorLogTypes)));
             }
 
         }
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/resources/application-cus-71.properties b/modules/i3plus-ext-mes-apiservice/src/main/resources/application-cus-71.properties
deleted file mode 100644
index 6231149..0000000
--- a/modules/i3plus-ext-mes-apiservice/src/main/resources/application-cus-71.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-#\u5B89\u9053\u62D3\u6570\u636E\u6E90
-impp.yfas.datasource.isopen=true
-#WMS\u6570\u636E\u6E90
-impp.mes.datasource.isopen=true
-#\u6570\u636E\u6E90\u7684\u522B\u540D
-impp.mes.datasource.alias=mesDataSource
-impp.mes.datasource.driver-class-name=com.mysql.jdbc.Driver
-impp.mes.datasource.jdbc-url=jdbc:mysql://10.195.88.71:3316/impp_i3_mes?autoReconnect=true&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true
-#impp.mes.datasource.jdbc-url=jdbc:sqlserver://139.224.200.147:20037;DatabaseName=impp_i3_mes;
-impp.mes.datasource.username=root
-#impp.mes.datasource.password=Test123!
-impp.mes.datasource.password=estsh123
-#Admin123!
-
-
-#\u6570\u636E\u6E90\u7684\u522B\u540D
-impp.yfas.datasource.alias=yfasDataSource
-impp.yfas.datasource.driver-class-name=com.mysql.jdbc.Driver
-impp.yfas.datasource.jdbc-url=jdbc:mysql://10.195.88.71:3316/impp_i3_wms_sap_if?autoReconnect=true&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true
-#impp.yfas.datasource.jdbc-url=jdbc:sqlserver://139.224.200.147:20037;DatabaseName=impp_i3_mes;
-impp.yfas.datasource.username=root
-impp.yfas.datasource.password=estsh123
-
-#\u6570\u636E\u6E90\u7684\u522B\u540D
-#impp.wms.datasource.isopen=true
-#impp.wms.datasource.alias=wmsDataSource
-#impp.wms.datasource.driver-class-name=com.mysql.jdbc.Driver
-#impp.wms.datasource.jdbc-url=jdbc:mysql://dbmaster:3306/impp_i3_wms?autoReconnect=true&useSSL=false&characterEncoding=utf-8
-#impp.wms.datasource.username=root
-#impp.wms.datasource.password=estsh123
-#
-##SWEB??????????
-#impp.sweb.datasource.isopen=true
-#impp.sweb.datasource.alias=swebDataSource
-#impp.sweb.datasource.driver-class-name=com.mysql.jdbc.Driver
-#impp.sweb.datasource.jdbc-url=jdbc:mysql://dbmaster:3306/impp_i3_wms?autoReconnect=true&useSSL=false&characterEncoding=utf-8
-#impp.sweb.datasource.username=root
-#impp.sweb.datasource.password=estsh123
-
-#Pisces数据源
-impp.pisces.datasource.isopen=true
-impp.pisces.datasource.alias=piscesDataSource
-impp.pisces.datasource.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver
-impp.pisces.datasource.jdbc-url=jdbc:sqlserver://172.28.239.113;SelectMethod=cursor;DatabaseName=Pisces
-impp.pisces.datasource.username=sa
-impp.pisces.datasource.password=sahasnopassword
\ No newline at end of file