Merge branch 'master' of https://github.com/loou/wms_rfid.git
Merge branch 'master' of https://github.com/loou/wms_rfid.git
Merge branch 'master' of https://github.com/loou/wms_rfid.git
添加一个“迁移数据库”功能
Signed-off-by: nameseven <git1302@163.com>
2013-03-20 18:00:47 迁移页面
Signed-off-by: nameseven <git1302@163.com>
迁移调整（完成）
Signed-off-by: nameseven <git1302@163.com>
迁移功能（优化）
Signed-off-by: nameseven <git1302@163.com>
封装JS
Signed-off-by: nameseven <git1302@163.com>
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git
漏掉一个（GIT的BUG）
Signed-off-by: nameseven <git1302@163.com>
历史表弹窗添加说明
Signed-off-by: nameseven <git1302@163.com>
Merge remote-tracking branch 'refs/remotes/ljj/master'

Conflicts:
	code/Authority/Wms/Controllers/Wms/StockIn/StockInBillController.cs
	code/Authority/Wms/Controllers/Wms/StockMove/StockMoveBillController.cs
	code/Authority/Wms/Views/Shared/_FunctionPartial.cshtml
	code/Authority/Wms/Wms.csproj