Index: ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js
===================================================================
diff -u -r28071 -r28108
--- ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js	(.../config.js)	(revision 28071)
+++ ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js	(.../config.js)	(revision 28108)
@@ -211,7 +211,6 @@
   overFulled : { "className" : "my_row_red" , "color" : "#ff0000"},//pc/pda超过待发数量的颜色（若pc和pda颜色一致，类名和颜色值必须对应一致）
   unsterilizedColor : { "className" : "my_row_yellow" , "color" : "#ffff00"},//未灭菌的颜色
   sterilizedColor : { "className" : "my_row_blue" , "color" : "#00ffff"}//已灭菌的颜色
-<<<<<<< .mine
   },
   //值为3，支持发货单签收和器械包签收
   signModeOfPDASignModule:3,
@@ -223,13 +222,8 @@
   enablePDABorrowEachOtherModule:true,
   //启用仪器图谱模块
   toussePicturesShow:true
-||||||| .r28036
-  }
-=======
-  },
   //提取住院号的正则表达式
   regExpForExtractingHospitalNumber:".{1,}[0-9]{10}$",
   //提取诊疗号的正则表达式
   regExpForExtractingClinicNumber:".{1,}[0-9]{10}$"
->>>>>>> .r28070
 }
\ No newline at end of file