Merge branch 'dev' of C:\Code\IdeaProjects\yfai\YF\i3plus-mes-yfai with conflicts.

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/board/IMesYfBoardServiceImpl.java

@@ -277,8 +277,6 @@ public class IMesYfBoardServiceImpl implements IMesYfBoardService {
                         //最新的点检单结果为 NOK
                         //结果设置为“异常”
                         resultModel.setInspectionResults(MesExtEnumUtil.INSPECTION_RESULTS.ABNORMAL.getValue());
-                    } else {
-                        resultModel.setInspectionResults(MesExtEnumUtil.INSPECTION_RESULTS.NOT_DONE.getValue());
                     }
                 }else {
                     //不存在该种点检类型的点检单数据

modules/i3plus-ext-mes-apiservice/src/main/resources/application-71.properties

@@ -1,7 +1,7 @@
 #\u9879\u76EE\u7AEF\u53E3
 server.port=8300
 #\u672C\u673Aip
-impp.server.ip=172.24.96.1
+impp.server.ip=10.196.75.158
 #\u94FE\u8DEF\u8FFD\u8E2Azipkin\u63A7\u5236\u53F0ip\u5730\u5740
 impp.console.ip=http://10.195.88.71:8010
 ################ \u529F\u80FD\u914D\u7F6E1 ################