Merge branch 'pxb' into xin

xin

5 days ago 044a57d2133b2363a6f0d3d167b3eaa587c70b91

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

@@ -19,4 +19,8 @@
    IPage<UserAddress> findAll(@Param("criteria") UserAddressQueryCriteria criteria, Page<Object> page);

    List<UserAddress> findAll(@Param("criteria") UserAddressQueryCriteria criteria);

    void isDefault(Long userId);

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