Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs

zjj

2024-11-09 728ae1ba12ed4f59fa4dd897b74dd55b415856e5

 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;