productDev/zbomyoujia.git

			@@ -69,7 +69,12 @@
			<span v-if="row.crmStatus ==2" style="color: red">提交失败</span>
			</template>
			</el-table-column>
			<el-table-column prop="createDate" label="创建时间" min-width="120px"></el-table-column>
			<el-table-column prop="provinceName" label="省份名称" min-width="100px">
			<template slot-scope="{row}">
			{{row.provinceName\|\|''}}{{row.cityName\|\|''}}
			</template>
			</el-table-column>
			<el-table-column prop="createDate" label="创建时间" min-width="140px"></el-table-column>
			<el-table-column prop="orderDate" label="预约量房时间" min-width="120px"></el-table-column>
			<el-table-column prop="plaDate" label="计划装修开始时间" min-width="120px">
			<template slot-scope="{row}">
			@@ -126,8 +131,6 @@
			</template>
			</el-table-column>
			<el-table-column prop="styleInfo" label="风格" min-width="100px"></el-table-column>
			<el-table-column prop="provinceName" label="省份名称" min-width="100px"></el-table-column>
			<el-table-column prop="cityName" label="城市名称" min-width="100px"></el-table-column>
			<el-table-column prop="budget" label="装修预算(元)" min-width="100px"></el-table-column>
			<el-table-column prop="crmDate" label="crm提交时间" min-width="100px"></el-table-column>
			<el-table-column prop="crmInfo" label="crm提交备注" min-width="100px"></el-table-column>

			@@ -191,13 +191,7 @@
			if (pageWrap.getModel().getAreaCode() != null) {
			queryWrapper.lambda().eq(Customer::getAreaCode, pageWrap.getModel().getAreaCode());
			}
			for(PageWrap.SortData sortData: pageWrap.getSorts()) {
			if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
			queryWrapper.orderByDesc(sortData.getProperty());
			} else {
			queryWrapper.orderByAsc(sortData.getProperty());
			}
			}
			queryWrapper.lambda().orderByDesc(Customer::getCreateDate );
			return PageData.from(customerMapper.selectPage(page, queryWrapper));
			}

			@@ -28,6 +28,7 @@
			import com.doumee.dao.business.CustomerUserMapper;
			import com.doumee.dao.business.MemberMapper;
			import com.doumee.dao.business.UsersMapper;
			import com.doumee.dao.business.model.CustomerUser;
			import com.doumee.dao.business.model.Member;
			import com.doumee.dao.business.model.Users;
			import com.doumee.dao.web.reqeust.EditMemberRequest;

	admin/src/views/business/customerLog.vue	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史