Merge branch 'pxb' into xin

xin

yesterday d3563f0bdb487124d79cdd20d0f8bfc79db31f24

 oying-system/src/main/java/com/oying/modules/sh/mapper/UserAddressMapper.java

@@ -21,4 +21,6 @@
    List<UserAddress> findAll(@Param("criteria") UserAddressQueryCriteria criteria);

    void isDefault(Long userId);

    UserAddress getById(Long addressId, Long userId, Double longitude, Double latitude);
}