Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

cloud-model/src/main/resources/mapper/MouldOperationDynamicsMapper.xml

@@ -23,13 +23,13 @@
     <sql id="Base_Column_List">
         id, file_id, operator_id, operator_name, indate, file_name, belong_type, content, mould_id, is_pass, applicant_id, applicant_name, is_update
     </sql>
-    <select id="selectOperationDynamicsList">
+    <select id="selectOperationDynamicsList" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
         from
         tb_mould_operation_dynamics
         where
-        mould_id
-        indate between #{startTime} and #{endTime}
+        mould_id = #{userVO.mouldId}
+        and indate between #{startTime} and #{endTime}
     </select>
 </mapper>