Commit 7635b85d authored by hujun's avatar hujun

''

parent 29215cda
......@@ -1088,6 +1088,7 @@ class Finance extends Basic
foreach($list as $k2=>$v2) {
$list[$k2]['store_name'] = array_key_exists($v2['store_id'], $store_data) ? $store_data[$v2['store_id']] : '';
$list[$k2]['address'] = array_key_exists($v2['house_id'], $house_data) ? $house_data[$v2['house_id']] : '';
$list[$k2]['income_time'] = empty($v2['income_time']) ? '':$v2['income_time'];
}
$data['data']['list'] = $list;
......
......@@ -2062,6 +2062,7 @@ class OfficePayLog extends Basic
foreach($list as $k2=>$v2) {
$list[$k2]['store_name'] = array_key_exists($v2['store_id'], $store_data) ? $store_data[$v2['store_id']] : '';
$list[$k2]['address'] = array_key_exists($v2['house_id'], $house_data) ? $house_data[$v2['house_id']] : '';
$list[$k2]['income_time'] = empty($v2['income_time']) ? '':$v2['income_time'];
}
$data['data']['list'] = $list;
......
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