Commit 41b13f28 authored by wang.wenrong's avatar wang.wenrong

Merge branch 'wwr' into 'develop'

设备管理复用cid逻辑

See merge request !50
parents a7fe29b8 7df953fe
...@@ -152,10 +152,6 @@ async def get_user_hardware_info(company_id, page_num, page_size): ...@@ -152,10 +152,6 @@ async def get_user_hardware_info(company_id, page_num, page_size):
data["inline_capacity"] = meter_param["tc"] data["inline_capacity"] = meter_param["tc"]
if not check_value_is_null(meter_param["vc"]): if not check_value_is_null(meter_param["vc"]):
data["rated_voltage"] = meter_param["vc"] data["rated_voltage"] = meter_param["vc"]
if not check_value_is_null(meter_param["bureau_number"]):
data["belong_number"] = meter_param["bureau_number"]
if not check_value_is_null(meter_param["td_type"]):
data["device_type"] = meter_param["td_type"]
datas.append(data) datas.append(data)
return { return {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment