Merge branch 'dev' into xiaoyang

wanshenmean

2 天以前 ef57389fd66aca85d6fb4a73c0f7c1c1f7d607b2

 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) {