Merge remote-tracking branch 'origin/master'

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EquipmentScrapMapper.xml

@@ -5,6 +5,7 @@
 
     <sql id="where">
         <where>
+            e.id is not null
             <if test="params.brand != null and params.brand != ''">
                 and e.brand = #{params.brand}
             </if>