Merge branch 'dev' into webUi
# Conflicts:
# frontend/views/appointment/all.php
# frontend/views/appointment/first.php
# frontend/views/appointment/today.php
# frontend/views/car/search.php
# frontend/views/database/a-index.php
# frontend/views/database/b-index.php
# frontend/views/database/c-index.php
# frontend/views/database/d-index.php
# frontend/views/database/invalid-index.php
# frontend/views/finance/budian-list.php
# frontend/views/finance/chuna-gongzi-list.php
# frontend/views/finance/gongzi-all-list.php
# frontend/views/finance/pay2-list.php
# frontend/views/finance/receipt.php
# frontend/views/finance/receipt2.php
# frontend/views/finance/ticheng-jisuan.php
# frontend/views/fix-car/my-list-finish.php
# frontend/views/fix-car/my-list.php
# frontend/views/fix-car/step1-list.php
# frontend/views/gift/gift-tj.php
# frontend/views/gift/gift-use.php
# frontend/views/gift/index.php
# frontend/views/gift/ticket-tj.php
# frontend/views/insurer/finance-mng.php
# frontend/views/insurer/my-list.php
# frontend/views/insurer/my-return-list.php
# frontend/views/insurer/office-mng.php
# frontend/views/insurer/original-mng.php
# frontend/views/insurer/search.php
# frontend/views/personnel/pay-list.php
# frontend/views/phone-center/call-records.php
# frontend/views/phone-center/usercall-index.php
# frontend/views/renewal/all.php
# frontend/views/renewal/first.php
# frontend/views/renewal/today.php
|
