trivial
Merge branch 'reimplementation_cargo' of https://github.com/xiechao06/lite-mms into reimplementation_cargo

Conflicts:
	lite_mms/portal/cargo/views.py
Merge branch 'reimplementation_cargo' of https://github.com/xiechao06/lite-mms into reimplementation_cargo

Conflicts:
	lite_mms/portal/cargo/actions.py
	lite_mms/portal/cargo/views.py
	lite_mms/portal/order2/__init__.py
Merge branch 'reimplementation_cargo' of https://github.com/xiechao06/lite-mms into reimplementation_cargo

Conflicts:
	lite_mms/portal/admin2/views.py