# Conflicts:
#	application/index/controller/Finance.php
#	application/index/controller/ImageDepot.php
#	public/app/dist/index.html
#	public/app/dist/static/css/app.18f66e05aeedf4028dbf86453eab6b23.css
#	public/app/dist/static/css/app.370df8a02c6ffd39798798a503aab7d5.css
#	public/app/dist/static/css/app.a73181a8689d77665f3ecd7635761082.css
#	public/appnew/src/components/shop/redPackMask.vue
#	public/appnew/src/components/shop/shopList.vue