Merge remote-tracking branch 'origin/master'
This commit is contained in:
		
						commit
						1726130093
					
				| 
						 | 
					@ -52,4 +52,7 @@ public class MaLeaseVo extends MaLeaseInfo {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @ApiModelProperty(value = "浏览次数")
 | 
					    @ApiModelProperty(value = "浏览次数")
 | 
				
			||||||
    private Integer searchNum;
 | 
					    private Integer searchNum;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @ApiModelProperty(value = "接单人联系方式")
 | 
				
			||||||
 | 
					    private String orderPhone;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -271,12 +271,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 | 
				
			||||||
        END AS groupName,
 | 
					        END AS groupName,
 | 
				
			||||||
        m.publish_user as publishUser,
 | 
					        m.publish_user as publishUser,
 | 
				
			||||||
        b.id as areaId,
 | 
					        b.id as areaId,
 | 
				
			||||||
        b.name as areaName
 | 
					        b.name as areaName,
 | 
				
			||||||
 | 
					        su1.nick_name as orderUser,
 | 
				
			||||||
 | 
					        su1.phonenumber as orderPhone
 | 
				
			||||||
        FROM
 | 
					        FROM
 | 
				
			||||||
        ma_lease_info m
 | 
					        ma_lease_info m
 | 
				
			||||||
                LEFT JOIN bm_company_info c ON m.company_id = c.company_id
 | 
					                LEFT JOIN bm_company_info c ON m.company_id = c.company_id
 | 
				
			||||||
                LEFT JOIN base_address b ON b.id = m.area_id
 | 
					                LEFT JOIN base_address b ON b.id = m.area_id
 | 
				
			||||||
                LEFT JOIN sys_user su ON m.publish_user = su.user_id
 | 
					                LEFT JOIN sys_user su ON m.publish_user = su.user_id
 | 
				
			||||||
 | 
					                LEFT JOIN sys_user su1 ON m.order_user = su1.user_id
 | 
				
			||||||
                LEFT JOIN ma_type mt4 ON mt4.type_id = m.type_id and mt4.del_flag = '0'
 | 
					                LEFT JOIN ma_type mt4 ON mt4.type_id = m.type_id and mt4.del_flag = '0'
 | 
				
			||||||
                LEFT JOIN ma_type mt3 ON mt3.type_id = mt4.parent_id and mt3.del_flag = '0'
 | 
					                LEFT JOIN ma_type mt3 ON mt3.type_id = mt4.parent_id and mt3.del_flag = '0'
 | 
				
			||||||
                LEFT JOIN ma_type mt2 ON mt2.type_id = mt3.parent_id and mt2.del_flag = '0'
 | 
					                LEFT JOIN ma_type mt2 ON mt2.type_id = mt3.parent_id and mt2.del_flag = '0'
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue