Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/warehouse/profitwarehousing/mapper/xml/ProfitWarehousingInfoMapper.xml

@@ -59,7 +59,7 @@
 				AND a.type = #{type.id}
 			</if>
 			<if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
-				AND profitWarehousing.time &gt;= #{beginTime} AND profitWarehousing.time &lt;= #{endTime} AND (qrCode.state = '2')
+				AND profitWarehousing.time &gt;= #{beginTime} AND profitWarehousing.time &lt;= #{endTime} AND (qrCode.state = '2' or qrCode.state = '3')
 			</if>
 		</where>
 		<choose>