Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp

src/main/resources/sql/mapper/adds/nims/dsuseMgtDoc-mapper.xml

@@ -43,7 +43,7 @@
     </sql>
 
     <select id="selectDsuseMgtDocList" parameterType="map" resultType="dataobject">
-    /* 폐기관리상세 목록 조회(dsuseMgtDetailMapper.selectDsuseMgtDetailList) */
+    /* 폐기관리문서 목록 조회(dsuseMgtDocMapper.selectDsuseMgtDocList) */
         <include refid="utility.paging-prefix" />
         <include refid="select" />
          WHERE 1=1

src/main/webapp/WEB-INF/jsp/adds/nims/barcode-main.jsp

@@ -38,7 +38,7 @@
         document.getElementById('result2').value = '';
         console.log('change');
         submitBarcodeScan();
-    }, {passive: true})
+    }, {passive: true});
 
     document.querySelector("#btnBarcode").addEventListener('click', function () {
         console.log('click');
@@ -48,9 +48,9 @@
         }
         document.getElementById('result2').value = '';
         submitBarcodeScan();
-    }, {passive: true})
+    }, {passive: true});
 
-    window.addEventListener('load', function () {
+	$(document).ready(function () {
 		
         const sec9 = document.querySelector('#divImage');
         const uploadBox = sec9.querySelector('#img');
@@ -127,7 +127,7 @@
                 }
             });
         });
-    }, {passive: true})
+    });
 
 
     function submitBarcodeScan(){