Commit 9c7fbffaeae0063caa492b54c4ba4c126e0d1281
1 parent
33026432
fix: 还原配置
Showing
2 changed files
with
42 additions
and
1 deletions
ruoyi-admin/admin-dockerfile
| @@ -16,6 +16,6 @@ RUN mkdir -p ${jar_home} | @@ -16,6 +16,6 @@ RUN mkdir -p ${jar_home} | ||
| 16 | # 指定工作区 | 16 | # 指定工作区 |
| 17 | WORKDIR ${jar_home} | 17 | WORKDIR ${jar_home} |
| 18 | # 把jar包复制到容器内 | 18 | # 把jar包复制到容器内 |
| 19 | -COPY ./target/*.jar ${jar_home}${jar_name}.jar | 19 | +COPY ruoyi-admin/target/*.jar ${jar_home}${jar_name}.jar |
| 20 | # 执行命令 | 20 | # 执行命令 |
| 21 | ENTRYPOINT java -jar ${jar_home}${jar_name}.jar --spring.profiles.active=${env_file} | 21 | ENTRYPOINT java -jar ${jar_home}${jar_name}.jar --spring.profiles.active=${env_file} |
| 22 | \ No newline at end of file | 22 | \ No newline at end of file |
ruoyi-admin/src/main/java/com/ruoyi/pojo/request/ReportViewRequestVo.java
0 → 100644
| 1 | +package com.ruoyi.pojo.request; | ||
| 2 | + | ||
| 3 | +import io.swagger.annotations.ApiModel; | ||
| 4 | +import io.swagger.annotations.ApiModelProperty; | ||
| 5 | +import lombok.Data; | ||
| 6 | + | ||
| 7 | +/** | ||
| 8 | + * 接收前端查询vo | ||
| 9 | + * | ||
| 10 | + * @author 20412 | ||
| 11 | + */ | ||
| 12 | +@ApiModel("可视化大屏请求对象") | ||
| 13 | +@Data | ||
| 14 | +public class ReportViewRequestVo { | ||
| 15 | + /** | ||
| 16 | + * 员工工号 | ||
| 17 | + */ | ||
| 18 | + @ApiModelProperty("员工工号") | ||
| 19 | + private String jobCode; | ||
| 20 | + /** | ||
| 21 | + * 开始时间 | ||
| 22 | + */ | ||
| 23 | + @ApiModelProperty("开始时间") | ||
| 24 | + String startTime; | ||
| 25 | + /** | ||
| 26 | + * 结束时间 | ||
| 27 | + */ | ||
| 28 | + @ApiModelProperty("结束时间") | ||
| 29 | + String endTime; | ||
| 30 | + /** | ||
| 31 | + * 签到状态 | ||
| 32 | + */ | ||
| 33 | + @ApiModelProperty("签到状态") | ||
| 34 | + Integer status; | ||
| 35 | + /** | ||
| 36 | + * 姓名 | ||
| 37 | + */ | ||
| 38 | + @ApiModelProperty("姓名") | ||
| 39 | + String name; | ||
| 40 | + | ||
| 41 | +} |