Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/storage/storage-server/src/main/resources/mapper/StockTakingMapper.xml

@@ -239,7 +239,7 @@
         ${con}
       </if>
       <if test="companyId != null">
-      and companyId = #{companyId}
+      and stocktaking.companyId = #{companyId}
       </if>
 
     </where>