diff --git a/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/controller/admin/UmsMemberController.java b/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/controller/admin/UmsMemberController.java index aceabd0ba..39290f4f7 100644 --- a/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/controller/admin/UmsMemberController.java +++ b/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/controller/admin/UmsMemberController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Arrays; -@Api(tags = "「系统端」会员管理") +@Api(tags = "「管理端」会员管理") @RestController @RequestMapping("/api/v1/members") @RequiredArgsConstructor diff --git a/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/convert/AddressConvert.java b/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/convert/AddressConvert.java index 6962fb4e0..8cd8f63f6 100644 --- a/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/convert/AddressConvert.java +++ b/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/convert/AddressConvert.java @@ -7,7 +7,7 @@ import org.mapstruct.Mapper; import java.util.List; /** - * 会员地址实体转换器 + * 会员地址对象转换器 * * @author haoxr * @date 2022/6/21 23:52 diff --git a/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/convert/MemberConvert.java b/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/convert/MemberConvert.java index d838ce02a..cc0c39078 100644 --- a/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/convert/MemberConvert.java +++ b/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/convert/MemberConvert.java @@ -9,7 +9,7 @@ import org.mapstruct.Mapping; import org.mapstruct.Mappings; /** - * 会员实体转换器 + * 会员对象转换器 * * @author haoxr * @date 2022/6/11 diff --git a/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/mapper/UmsMemberMapper.java b/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/mapper/UmsMemberMapper.java index e054a0357..78796c621 100644 --- a/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/mapper/UmsMemberMapper.java +++ b/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/mapper/UmsMemberMapper.java @@ -20,7 +20,7 @@ public interface UmsMemberMapper extends BaseMapper { " " + " WHERE nick_name like concat('%',#{nickname},'%')" + " " + - " ORDER BY gmt_modified DESC, gmt_create DESC" + + " ORDER BY update_time DESC, create_time DESC" + "") @Results({ @Result(id = true, column = "id", property = "id"), diff --git a/youlai-gateway/src/main/resources/bootstrap-dev.yml b/youlai-gateway/src/main/resources/bootstrap-dev.yml index 2b25150a9..211e9e32b 100644 --- a/youlai-gateway/src/main/resources/bootstrap-dev.yml +++ b/youlai-gateway/src/main/resources/bootstrap-dev.yml @@ -9,7 +9,7 @@ spring: server-addr: http://localhost:8848 # 配置中心 config: - server-addr: http://c.youlai.tech:8848 + server-addr: http://localhost:8848 file-extension: yaml shared-configs[0]: data-id: youlai-common.yaml