Merge branch 'dev'

src/main/resources/sqlmapper/biz/cmm/cmm-fims-crackdown-mysql-mapper.xml

@@ -115,7 +115,7 @@
               </if>
             </if>
             <if test='sch_date_opt eq "regltDe"'>
-           AND trr.reglt_de BETWEEN #{sch_date_from} AND #{sch_date_to}
+           AND trr.reglt_de BETWEEN REPLACE(#{sch_date_from},'-','') AND REPLACE(#{sch_date_to},'-','')
             </if>
             <if test='sch_date_opt eq "registDt"'>
            AND SUBSTR(trr.regist_dt,1,8) BETWEEN REPLACE(#{sch_date_from},'-','') AND REPLACE(#{sch_date_to},'-','')

src/main/resources/sqlmapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml

@@ -61,10 +61,10 @@
 		<include refid="sqlRtReglt"/>
         <where>
             <if test='sch_date_opt eq "regltDe"'>
-           AND trr.reglt_de BETWEEN #{sch_date_from} AND #{sch_date_to}
+           AND trr.reglt_de BETWEEN REPLACE(#{sch_date_from},'-','') AND REPLACE(#{sch_date_to},'-','')
             </if>
             <if test='sch_date_opt eq "registDt"'>
-           AND trr.regist_dt BETWEEN #{sch_date_from} AND #{sch_date_to}
+           AND SUBSTR(trr.regist_dt,1,8) BETWEEN REPLACE(#{sch_date_from},'-','') AND REPLACE(#{sch_date_to},'-','')
             </if>
             <if test='vhcleNo != null and vhcleNo != ""'>
            AND INSTR(trr.vhcle_no, #{vhcleNo}) > 0

src/main/webapp/resources/3rd-party/paintweb/interfaces/default/layout.xhtml

@@ -22,7 +22,7 @@
         this case the class names will be .paintweb_cmd_historyUndo and 
         .paintweb_command.  -->
         <!--FIXME: 페인트웹 기능 항목 추가/제거-->
-        <li data-pwCommand="historyRedo">Redo</li>
+        <!--<li data-pwCommand="historyRedo">Redo</li>-->
         <li data-pwCommand="historyUndo">Undo</li>
 
         <li class="paintweb_toolSeparator">&#160;</li>

src/main/webapp/resources/biz/common/js/codeComboData.js

@@ -107,6 +107,8 @@ ComboCodeData = {
         ,{value: '2', text: '승합'}
         ,{value: '3', text: '화물'}
         ,{value: '4', text: '특수'}
+        ,{value: '5', text: '이륜차'}
+        ,{value: '6', text: '건설기계'}
     ]
 
     // 단속처리상태코드 : FIM010