Merge remote-tracking branch 'origin/dev' into feature/ysCha

# Conflicts:
#	src/components/floor-plan/modal/basic/step/Trestle.jsx

src/components/floor-plan/modal/basic/step/Trestle.jsx

@@ -21,6 +21,7 @@ const Trestle = forwardRef((props, ref) => {
   const [isAutoSelecting, setIsAutoSelecting] = useState(false) // 자동 선택 중인지 상태
   const [autoSelectTimeout, setAutoSelectTimeout] = useState(null) // 타임아웃 참조
   const autoSelectTimeoutRef = useRef(null)
+
   // 공통 타임아웃 설정 (밀리초)
   const AUTO_SELECT_TIMEOUT = 700 // API 호출 완료 대기 시간
   const {
@@ -466,7 +467,8 @@ const Trestle = forwardRef((props, ref) => {
             ...selectedConstMthd,
             ...selectedRoofBase,
           },
-          construction: {//data.constTp === trestleState.constTp
+          construction: {
+            //...constructionList.find((data) => newAddedRoofs[index].construction.constTp === data.constTp),
             ...constructionList.find((data) => trestleState.constTp === data.constTp),
             cvrYn,
             snowGdPossYn,