Merge branch 'test' of http://123.60.19.203:8088/3254194295/hitch-sb-manage into test

 Conflicts:

	platform-dao/src/main/resources/mapper/store/SpareStoreMapper.xml

platform-dao/src/main/resources/mapper/store/SpareStoreMapper.xml

@@ -139,9 +139,7 @@ sparestore.min_stock
         (
         SELECT
         sparestore.spare_id,
-        any_value(sparestore.min_stock) maxStock,
-        any_value(sparestore.max_stock) minStock,
-        SUM( any_value(num) ) AS totalStock
+        SUM( num ) AS totalStock
         FROM
         t_spare_store sparestore
         <where>