Merge remote-tracking branch 'origin/feature/GFRS-1215【待确定】国富人寿福享年年年金保险' into release/0811

# Conflicts:
#	src/views/ebiz/common/MainRiskList.vue

src/api/ebiz/common/common.js

@@ -12,7 +12,8 @@ export function calculatePremium(data) {
 // 主险列表
 export function mainRiskList(data) {
   return request({
-    url: getUrl(`/${localStorage.isFrom}/product/getMainRiskLst`, 1),
+    url: getUrl(`/sale/product/getMainRiskLst`, 1),
+    // url: getUrl(`/${localStorage.isFrom}/product/getMainRiskLst`, 1),
     method: 'post',
     data
   })

src/assets/js/utils/data-dictionary.js

@@ -958,6 +958,11 @@ export default {
       shortName: '重疾险',
       name: '国富人寿桂企保重大疾病保险',
       code: 'GFRS_M0024'
+    },
+    {
+      shortName: '年金险',
+      name: '国富人寿福享年年长期年金保险',
+      code: 'GFRS_M0026'
     }
   ],
   // 职级