Merge branch 'pxb' into xin

xin

yesterday d3563f0bdb487124d79cdd20d0f8bfc79db31f24

 oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreMerchantController.java

@@ -188,7 +188,7 @@
    public ResponseEntity<?> updateAddress(@PathVariable("storeId") Long storeId,
                              @Validated(value = StoreFieldUpdateRequest.UpdateStoreAddressGroup.class)
                              @RequestBody StoreFieldUpdateRequest request) {
        storeService.updateAddress(storeId, request.getAddress(), request.getVersion());
        storeService.updateAddress(storeId, request.getAddress(), request.getLongitude(), request.getLatitude(), request.getVersion());
        return ResponseEntity.noContent().build();
    }