Merge branch 'wwr' into 'develop'

设备管理复用cid逻辑

See merge request !48

unify_api/modules/product_info/procedures/hardware_pds.py

@@ -222,7 +222,7 @@ async def hardware_statistics(company_id):
                     "left JOIN monitor c on p.mtid = c.mtid " \
                     "left join monitor_reuse m on c.mtid = m.mtid " \
                     "where c.demolished=0 and " \
-                    "(p.cid_belongedto =%s or m.cid=%s)"
+                    "(p.cid =%s or m.cid=%s)"
 
         points = await conn.fetchall(sql=point_sql,
                                      args=(company_id, company_id))