广告管理、商家结款审核

广告管理、商家结款审核
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:

	project/src/ixinyang-web/ixinyang/backend/controllers/CusConsumptionRecordsController.php

	project/src/ixinyang-web/ixinyang/backend/controllers/StoBalanceReviewController.php

	project/src/ixinyang-web/ixinyang/backend/models/CusConsumptionRecords.php
	project/src/ixinyang-web/ixinyang/backend/models/StoBalanceReview.php

	project/src/ixinyang-web/ixinyang/backend/views/cus-consumption-records/_form.php

	project/src/ixinyang-web/ixinyang/backend/views/cus-consumption-records/index.php

	project/src/ixinyang-web/ixinyang/backend/views/cus-consumption-records/update.php

	project/src/ixinyang-web/ixinyang/backend/views/cus-consumption-records/view.php

	project/src/ixinyang-web/ixinyang/backend/views/sto-balance-review/_form.php

	project/src/ixinyang-web/ixinyang/backend/views/sto-balance-review/index.php

	project/src/ixinyang-web/ixinyang/backend/views/sto-balance-review/view.php
	project/src/ixinyang-web/ixinyang/backend/web/js/dialog.js
Merge branch 'dev' of https://github.com/huayancreate/lovexinyang into dev