Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang...

puzhibing

昨天 25d47cb937792b48690d5ccdd8aa06b202cd0967

Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0

# Conflicts:
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Pop.java

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/TShopAppointableTime.java

@@ -33,8 +33,8 @@
    /**
     * 预约时间
     */
    @TableField("appointable_time")
    private LocalDateTime appointableTime;
    @TableField("appointment_time")
    private LocalDateTime appointmentTime;
    /**
     * 状态（0=已取消，1=待确认，2=等待中，3=已结束）
     */

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java

@@ -98,7 +98,7 @@
        Long userId = SecurityUtils.getUserId();
        one = new TShopAppointableTime();
        one.setShopId(dto.getShopId());
        one.setAppointableTime(LocalDateTime.parse(dto.getTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")));
        one.setAppointmentTime(LocalDateTime.parse(dto.getTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")));
        one.setUserId(userId);
        one.setStatus(1);
        one.setCreateTime(LocalDateTime.now());

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopAppointableTimeServiceImpl.java

@@ -57,7 +57,7 @@
        shopAppointableTimeList.forEach(shopAppointableTime -> {
            ShopAppointableTimeListVo shopAppointableTimeListVo = new ShopAppointableTimeListVo();
            shopAppointableTimeListVo.setId(shopAppointableTime.getId());
            shopAppointableTimeListVo.setAppointableTime(shopAppointableTime.getAppointableTime());
            shopAppointableTimeListVo.setAppointableTime(shopAppointableTime.getAppointmentTime());
            shopAppointableTimeListVo.setStatus(shopAppointableTime.getStatus());
            Member member = remoteMemberService.getMember(shopAppointableTime.getUserId()).getData();
            shopAppointableTimeListVo.setUserName(member.getRealName());

 ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopAppointableTimeMapper.xml

@@ -24,7 +24,7 @@
    
    
    
    <select id="getShopAppointableTimeList" resultType="com.ruoyi.system.api.domain.poji.shop.ShopAppointableTime">
    <select id="getShopAppointableTimeList" resultType="com.ruoyi.system.api.domain.poji.shop.TShopAppointableTime">
        select * from (
            select
                a.*,