Merge remote-tracking branch 'remotes/origin/yufei' into master

gdg

2021-02-02 aab1d1e20e7b4b72a9bd98c5d26fdfb087b4c57b

 src/main/java/com/nanometer/smartlab/entity/OpeApplyReserve.java

@@ -39,6 +39,7 @@

   private String project;
   private String projectManage;
   private String applyUser;

   public ApplyStatus getStatus() {
      return status;
@@ -231,4 +232,12 @@
   public void setCacheUpdateList(List<OpeWarehouseReserve> cacheUpdateList) {
      this.cacheUpdateList = cacheUpdateList;
   }

   public String getApplyUser() {
      return applyUser;
   }

   public void setApplyUser(String applyUser) {
      this.applyUser = applyUser;
   }
}