Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

18516761980

2022-06-21 1e07ab637274948e392a37f840c3e6ce9cbe71a1

 src/main/java/com/zy/asrs/entity/ViewWorkInBean.java

@@ -31,6 +31,9 @@

   private Integer row;

   private String crn_str_time;
   private String crn_end_time;

   @ApiModelProperty(value= "工作号")
   private Integer wrk_no;