Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml

@@ -124,7 +124,7 @@
     <select id="pageOwn" resultType="com.logpm.distribution.vo.DistributionStockListVO">
         <include refid="stockList"></include>
         <where>
-            ldsi.is_deleted = 0 and ldsi.hide=1
+            ldsi.is_deleted = 0
             <if test=" param.serviceNumber != null and param.serviceNumber != ''">and ldsi.service_number like
                 concat('%',#{param.serviceNumber},'%')
             </if>