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

野心家

2023-08-11 b0f1c7464b31e70e227e01ae7d36e20262215ace

 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;