Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/resources/mapper/MaterialGoodsStockCMapper.xml

@@ -27,7 +27,7 @@
         FROM
         worker_stock
         WHERE
-        company_wechat_id = #{companyWechatId}
+        company_wechat_id = #{dto.companyWechatId}
         AND
         identity = #{dto.identity}
         AND