Index: ssts-web/src/main/resources/spring/projects/kpszxyy/timer.xml =================================================================== diff -u --- ssts-web/src/main/resources/spring/projects/kpszxyy/timer.xml (revision 0) +++ ssts-web/src/main/resources/spring/projects/kpszxyy/timer.xml (revision 23297) @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/handover/service/HandoverManagerImpl.java =================================================================== diff -u -r23272 -r23297 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/handover/service/HandoverManagerImpl.java (.../HandoverManagerImpl.java) (revision 23272) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/handover/service/HandoverManagerImpl.java (.../HandoverManagerImpl.java) (revision 23297) @@ -105,7 +105,7 @@ if(null==hd){ continue; } - //讲交班内容、交班人、交班时间拼成一行显示 + //将交班内容、交班人、交班时间拼成一行显示 countStr+=hd.getHandoverNote(); countStr+="-->"+hd.getHandoverUserName(); countStr+=" "+ForgonDateUtils.safelyFormatDate(hd.getHandoverDate(),ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM,""); Index: ssts-web/src/main/webapp/disinfectsystem/config/kpszxyy/config.js =================================================================== diff -u -r23258 -r23297 --- ssts-web/src/main/webapp/disinfectsystem/config/kpszxyy/config.js (.../config.js) (revision 23258) +++ ssts-web/src/main/webapp/disinfectsystem/config/kpszxyy/config.js (.../config.js) (revision 23297) @@ -56,5 +56,7 @@ //是否记住上一次下送责任人。默认为false,表示不记住。如果showInvoicePersonInCharge配置为false,那么无论此配置为什么,都不记住 rememberLastInvoicePersonInCharge:false, //是否启用优先转换(包定义是否优先转换、使用记录转换转换申请单,点击优先转换申请单时只对优先转换为是的器械包先行转换),只有审核和转换申请单是分开的,这个配置才有意义 - enablePriorConvertApplyGoods : true + enablePriorConvertApplyGoods : true, + //是否显示设备接口菜单 + disableDeviceInterface :false } \ No newline at end of file