hp

src/store/index.js

@@ -38,14 +38,8 @@ export default new Vuex.Store({
       patientRegisterRd: { id: "" }, //体检人员记录
       patientRegisterTimes: 0, //体检人员登记窗口显示次数(弃用)
       addTimes: 0, //用于触发新增时初始化赋值
-<<<<<<< HEAD
       saveTimes:0,  //用于体检登记时，触发分组调整保存
       photo:"https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg", //单独抽出，拍照时会更新
-=======
-      saveTimes: 0,  //用于体检登记时，触发分组调整保存
-      photo:
-        "https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg", //单独抽出，拍照时会更新
->>>>>>> 8707ad6b3bfb1a5f5e84b63517a75bd718db5ab1
       cameraVisble: false, //拍照控件显示
       patientRegisterRdInit: {
         id: "", //id