Merge remote-tracking branch 'origin/20210716' into 20210716

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/MeterReplaceLogMapper.xml

@@ -309,8 +309,8 @@
       d.file_no LIKE concat('%',#{dto.deviceNo},'%'))
     </if>
     <if test="dto.replaceMethod != null"> and rl.replace_method = #{dto.replaceMethod}</if>
-    <if test="dto.startDate != null"> and rl.date_create <![CDATA[ >= ]]> #{dto.startDate}</if>
-    <if test="dto.endDate != null"> and rl.date_create <![CDATA[ <= ]]> #{dto.endDate}</if>
+    <if test="dto.startDate != null"> and rl.create_date <![CDATA[ >= ]]> #{dto.startDate}</if>
+    <if test="dto.endDate != null"> and rl.create_date <![CDATA[ <= ]]> #{dto.endDate}</if>
     <include refid="permissionCondition"/>
   </select>
 </mapper>