Merge remote-tracking branch 'origin/dev1.0' into dev1.0

src/main/resources/mapper/bus/storeGoodsLog/StoreGoodsLogMapper.xml

@@ -68,6 +68,8 @@
         left join sys_dept as dept_tb on sga.store_id = dept_tb.business_id
         where 1=1
             and sgl.del_flag = '0'
+            and sgl.io_type = '1'
+            and sgl.is_return = '0'
             <if test="entity.flag !=null and entity.flag != '' ">
                 and sgl.flag = #{entity.flag}
             </if>