Merge branch 'dev' into xiaoyang

wanshenmean

23 小时以前 5c6e99cb3b30e0b4127caa3b626c2b51ea038b61

 Code/WMS/WIDESEA_WMSClient/src/extension/stock/stockInfo.jsx

@@ -125,9 +125,9 @@
    },
    searchBefore(param) {
      const stockStatusFilter = {
        name: "stockStatus",
        value: "1",
        displayType: "notequal",
        name: "LocationId",
        value: "0",
        displayType: "notequal"
      };
      if (!param.wheres) {
        param.wheres = [];