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

zjj

2 天以前 11e2b6d43b6c1664f74963649dad9507db34c6ae

 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;