src/main/resources/static/views · d12a70ad4140a10066610198aa0a50f93322cf5e · zhangyusheng / YX_IDENT_beijing_auxiliary_YD · GitLab

History Find file

Merge remote-tracking branch 'origin/dev' into dev · d12a70ad
cuizhiyuan authored Apr 24, 2019
```
# Conflicts:
#	src/main/resources/static/index.html
#	src/main/resources/static/js/app.js
```
d12a70ad

Name	Last commit	Last update
..
ReadDeliveredInfo		Loading commit data...
addFailed		Loading commit data...
addRest		Loading commit data...
addTag		Loading commit data...
analysisLog		Loading commit data...
autoCheck		Loading commit data...
cardProdPackage		Loading commit data...
cardProdUpdate		Loading commit data...
createTaskList		Loading commit data...
dispatchTask		Loading commit data...
excelAndSearch		Loading commit data...
historyCards		Loading commit data...
login		Loading commit data...
materialManagement		Loading commit data...
packageLog		Loading commit data...
queryDeliveredReport		Loading commit data...
queryQualityCheckReport		Loading commit data...
querySortingReport		Loading commit data...
queryWorkGroupReport		Loading commit data...
receitp		Loading commit data...
report		Loading commit data...
saveDeliveredFailedInfo		Loading commit data...
searchCard		Loading commit data...
searchCardMsg		Loading commit data...
tagPrint		Loading commit data...
task		Loading commit data...
uploadExcelAndSearch		Loading commit data...
xmlAndSearch		Loading commit data...