Merge remote-tracking branch 'origin/master-base' into master-test

chenjiahe

2024-08-01 e74dade001072c3a0e93cd6d698df4df2262f5a3

 phis-feign/src/main/java/com/hz/his/dto/activity/ActivityLimitDto.java

@@ -1,8 +1,14 @@
package com.hz.his.dto.activity;


import com.fasterxml.jackson.annotation.JsonFormat;
import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import com.hz.his.dto.PageDto;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;

/**
 * 限制
@@ -13,4 +19,8 @@
    private String id;
    /**用户标识*/
    private String userId;

    private Date limitStartTime;

    private Date limitEndTime;
}