Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-07-07 0ab1b864458f36b294933112824b10b13770915e

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtFollowShopTaskDto.java

@@ -1,12 +1,8 @@
package com.ruoyi.shop.domain.dto;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.system.api.domain.dto.MerBaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;

/**
 * @author jqs34