Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/controller/TaPersonController.java

@@ -568,6 +568,7 @@ public class TaPersonController extends BaseController {
         }
         if (!StringUtils.isEmpty(phone)){
             person.setTel(phone);
+            person.setPhone(phone);
             if(person.getPersonType().equals(CommConstant.PERSON_REALTY_CONSULTANT)){
                 TaUser user = taUserService.getById(person.getUserId());
                 user.setPhone(phone);

src/main/java/com/huiju/estateagents/sample/controller/TaH5SampleController.java

@@ -92,7 +92,7 @@ public class TaH5SampleController extends BaseController {
             QueryWrapper<TaH5Sample> queryWrapper = new QueryWrapper<>();
             queryWrapper.like(!StringUtils.isEmpty(sampleName), "sample_name", sampleName);
             queryWrapper.like(!StringUtils.isEmpty(tag), "tag", tag);
-            queryWrapper.ne("status", CommConstant.STATUS_DELETE);
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
             queryWrapper.orderByDesc("order_no", "create_date");
 
             IPage<TaH5Sample> result = iTaH5SampleService.page(pg, queryWrapper);