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

zjj

3 天以前 78dde5ad6acc2a49fd08472afb61a1504ea791d9

 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;