|
|
@@ -200,16 +200,14 @@ export default {
|
|
|
_views_personal_done,
|
|
|
_views_complex_index,
|
|
|
_views_major_old_list,
|
|
|
-<<<<<<< HEAD
|
|
|
_views_commission_major_rate,
|
|
|
_views_finance_fund_stats,
|
|
|
_views_income_major_declare_market,
|
|
|
- _views_income_major_declare_evaluate
|
|
|
-=======
|
|
|
+ _views_income_major_declare_evaluate,
|
|
|
_views_assets_todo_list,
|
|
|
_views_assets_archived_list,
|
|
|
_views_assets_done_list,
|
|
|
_views_assets_terminate_list,
|
|
|
_views_assets_repertory_list
|
|
|
->>>>>>> 5e86d122d93018877631fa54a29f8ffe14e0d6b8
|
|
|
+
|
|
|
}
|
