wms / wms_shanghaijiaoda · Commits

 Conflicts:
	.idea/workspace.xml
	src/main/resources/static/css/style.css
	src/main/resources/templates/config/receiptPreference/edit.html
	src/main/resources/templates/task/taskHeader/taskHeader.html