Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

@@ -410,7 +410,8 @@ public class AdminCustomerController {
     @ResponseBody
     @RequiresPermissions("customer:add:customer")
     @RequestMapping(value = "/select_storeInfo")
-    public ResponseJson listStoreInfo(HttpServletRequest request, StoreInfo storeInfo,Integer isMyStore) {
+    public ResponseJson listStoreInfo(HttpServletRequest request, StoreInfo storeInfo,
+                                      @RequestParam(value = "isMyStore", defaultValue = "2", required = false) Integer isMyStore) {
 
         if(isMyStore == 1){
             //判断用户只能查看自己所能查询的公司的订单