modified:   lite_mms/models.py
	modified:   lite_mms/portal/admin2/views.py
	modified:   lite_mms/portal/order/views.py
	modified:   lite_mms/templates/store/store-bill.html
Merge remote-tracking branch 'origin/master'
add title_name
Merge remote-tracking branch 'origin/store-bill' into consignment
Merge branch 'master' into consignment

Conflicts:
	lite_mms/portal/delivery/views.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	lite_mms/portal/delivery/views.py
new store_bill's harbor is the old's harbor
Merge branch 'master' of https://github.com/xiechao06/lite-mms into current
Merge branch 'store_bill' into current
Merge remote-tracking branch 'origin/master'
change the return type of deduplicate from generator to list
Merge remote-tracking branch 'origin/deployed' into current

Conflicts:
	lite_mms/models.py
	lite_mms/utilities/functions.py
merge
http://42.121.6.193:8080/lite-mms/ticket/559
revert
http://42.121.6.193:8080/lite-mms/ticket/559
the team of product can be None
the team of product can be None
Merge branch 'master' into current
Merge remote-tracking branch 'origin/deployed' into current