Merge remote-tracking branch 'remotes/origin/linhaohong' into test

AdminController/UnicomManageController.py

@@ -1011,7 +1011,7 @@ class UnicomManageControllerView(View):
         获取4G流量套餐列表
         @return: 套餐列表
         """
-        combo_qs = UnicomCombo.objects.filter(is_del=False, combo_type__in=[0, 3])
+        combo_qs = UnicomCombo.objects.filter(is_del=False)
         if not combo_qs.exists():
             return response.json(173)
         combo_qs = combo_qs.values('id', 'combo_name').order_by('-created_time')
@@ -1264,3 +1264,4 @@ class UnicomManageControllerView(View):
             LOGGER.info('UnicomManageControllerView.transfer_device_package, errLine:{}, errMsg:{}'.format(
                 e.__traceback__.tb_lineno, repr(e)))
             return response.json(500)
+