Merge branch 'xiaoyang' into dev

wanshenmean

18 小时以前 2db17e312a9bf0cff60917104447260b86178ca2

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

@@ -58,8 +58,8 @@
    },

    searchBefore(param) {

      const stockStatusFilter = {

        name: "stockStatus",

        value: "1",

        name: "LocationId",

        value: "0",

        displayType: "int"

      };

      if (!param.wheres) {