Merge branch 'master' of http://git.dongkesoft.com:9001/DK-MES-3.0/mes-server-mdm

src/main/java/com/dk/mdm/mapper/mst/ProductDefectMapper.xml

@@ -5,9 +5,7 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        defect
-        .
-        defect_id
+        defect.defect_id,defect.defect_fines
         , defect.defect_code, defect.defect_name, defect.def_job_id, defect.defect_kind, defect.defect_types, defect.display_no, defect.remarks, defect.flg_valid, defect.fty_id, defect.op_create_time, defect.op_create_user_id, defect.op_update_time, defect.op_update_user_id, defect.op_app_code, defect.op_timestamp, defect.op_db_user
     </sql>
 
@@ -20,6 +18,8 @@
         <result column="defect_kind" property="defectKind"/>
         <result column="defect_types" property="defectTypes"
                 typeHandler="com.dk.common.infrastructure.handler.IntListTypeHandler"/>
+        <result column="defect_fines" property="defectFines"
+                typeHandler="com.dk.common.infrastructure.handler.IntListTypeHandler"/>
         <result column="display_no" property="displayNo"/>
         <result column="remarks" property="remarks"/>
         <result column="flg_valid" property="flgValid"/>