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

gdg

2021-02-02 aab1d1e20e7b4b72a9bd98c5d26fdfb087b4c57b

 src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java

@@ -47,8 +47,8 @@
/**
 * Created by cmower on 17/11/20.
 */
@Controller
@PropertySource(value = "WEB-INF/config.properties",encoding = "utf-8")
@Controller
@Scope("session")
public class WarehouseStockMngController extends BaseController {

@@ -624,7 +624,7 @@
         FacesUtils.info("至少选择一个");
         return;
      }

      this.userId = getUser().getId();
      this.menuController.goToPage(Constants.PAGE_WAREHOUSE_REAGENT_USE_NEW, Constants.PAGE_WAREHOUSE_STOCK_MNG);
   }
//
@@ -649,6 +649,8 @@
         }
      }
      checkTable = null;
      //
      this.userId = selectedTmpOrderList.get(0).getApplyUser();

      this.menuController.goToPage(Constants.PAGE_WAREHOUSE_REAGENT_USE_NEW_PERSON, Constants.PAGE_WAREHOUSE_STOCK_MNG);
   }