# Conflicts:
#	datacenter/urls.py
#	inventory/views.py
#	listobj/views.py
#	sales/views.py
#	templates/company/franchise/list_agents.html
#	templates/inventory/stock/batch_edit.html
#	templates/inventory/summary_details.html

# Conflicts:
#	inventory/views.py
#	sales/models.py
#	templates/label_scan/132125/index.html
#	thirdparty/views.py
#	wx/views.py

撤销 "合并分支 'revert-9f80f0d7' 到 'dev'"

查看合并请求 tj_django/datacenter!54

这将还原合并请求 !53

撤销 "合并分支 'dev' 到 'test'"

查看合并请求 tj_django/datacenter!53

这将还原合并请求 !52