Merge branch 'develop'

src/pages/fengkong/namelist/blackiplist/index.js

@@ -57,6 +57,7 @@ class BlackIpList extends React.PureComponent {
           if (text === 0) return '系统默认'
           else if (text === 1) return '风控规则自动拉黑'
           else if (text === 2) return '后台手动录入'
+          else if (text === 3) return '代理IP'
         }
       },
       {