处理冲突

src/pages/instrumentClickinUpload/index.tsx

@@ -55,7 +55,7 @@ export default class InstrumentClickInUpload extends Component<any, any> {
         secondClockImg: null,
         thirdClockImg: null,
       },
-      clockcontents:'',
+      clockcontents: "",
       // 现在选中的数据
       currentInfo: {
         modeVideo: "",
@@ -261,15 +261,7 @@ export default class InstrumentClickInUpload extends Component<any, any> {
   videoLoadedMetaData = async () => {};
 
   handleTextareaInput = async (e) => {
-<<<<<<< HEAD
     this.setState({ punchInInfo: { clockContent: e.detail.value } });
-=======
-      const punchInInfo = this.state.punchInInfo;
-      punchInInfo.clockContent = e.detail.value;
-      let clockcontents = e.detail.value;
-      this.setState({ punchInInfo, clockcontents });
-      // this.setState({ punchInInfo:{...punchInInfo,clockContent: e.detail.value} });
->>>>>>> qsj
   };
 
   onModeLockOpen = async () => {