解决合并冲突

src/main/resources/static/js/mz/hybrid_test.js

@@ -52,7 +52,8 @@ $(function () {
      * 身份证读卡
      */
     $("#siReadIdCard").on("click", function (t) {
-        siReadIdCard("idcard_01101");
+        // siReadIdCard("idcard_01101");
+        siReadIdCard("huashi_readcard");
     });
     //每隔三秒读一次身份证
     // setInterval(function () {

src/main/resources/static/js/mz/registration.js

@@ -178,7 +178,8 @@ $(function () {
      * 身份证读卡
      */
     $("#siReadIdCard").on("click", function (t) {
-        siReadIdCard("idcard_01101",1);
+        // siReadIdCard("idcard_01101",1);
+        siReadIdCard("huashi_readcard",1);
     });
 
     /**

src/main/resources/static/js/mz/toll_administration.js

@@ -745,7 +745,8 @@ function sfzReadCard() {
     }
     $.ajax({
         type: "GET",
-        url: 'http://localhost:8321/readcard/entry?param=idcard_01101',
+        // url: 'http://localhost:8321/readcard/entry?param=idcard_01101',
+        url: 'http://localhost:8321/readcard/entry?param=huashi_readcard',
         contentType: "application/json;charset=UTF-8",
         dataType: "json",
         async: true,
@@ -811,7 +812,8 @@ function reSiReadCard(asyncFlag,tfReadType) {
     }else if(tfReadType == '01'){
         params ='qrcode_01101'
     }else if(tfReadType =='02'){
-        params ='idcard_01101'
+        // params ='idcard_01101'
+        params ='huashi_readcard'
     }
     $.ajax({
         type: "GET",
@@ -3220,7 +3222,8 @@ function mztczfSiReadCardTypeChange() {
             } else if (mztczfSiReadCardType == "01") {
                 url += 'qrcode_01101';
             } else if (mztczfSiReadCardType == "02") {
-                url += 'idcard_01101';
+                // url += 'idcard_01101';
+                url += 'huashi_readcard';
             }else if (mztczfSiReadCardType == "04") {
                 url += 'face_01101';
             }

src/main/resources/static/js/zy/hospitalized.js

@@ -55,7 +55,8 @@ $(function () {
      * 身份证读卡
      */
     $("#siReadIdCard").on("click", function (t) {
-        siReadIdCard("idcard_01101",0);
+        // siReadIdCard("idcard_01101",0);
+        siReadIdCard("huashi_readcard",0);
     });
 
     /**