Merge remote-tracking branch 'origin/dev' 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/TaH5DemandController.java

@@ -359,6 +359,7 @@ public class TaH5DemandController extends BaseController {
     public ResponseBean updateH5Demand(@PathVariable Integer id,@RequestBody TaH5Demand taH5Demand, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            taH5Demand.setCreateDate(null);
             taH5Demand.setDemandId(id);
             taH5Demand.setUpdateDate(LocalDateTime.now());
             responseBean.addSuccess(iTaH5DemandService.updateById(taH5Demand));

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);
@@ -221,7 +221,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.eq(null != status, "demand_status", status);
+            queryWrapper.eq(null != status, "status", status);
             queryWrapper.ge(!StringUtils.isEmpty(startCreateDate), "date_format(create_date,'%Y-%m-%d')", startCreateDate);
             queryWrapper.le(!StringUtils.isEmpty(endCreateDate), "date_format(create_date,'%Y-%m-%d')", endCreateDate);
             queryWrapper.gt("status", CommConstant.STATUS_DELETE);

src/main/java/com/huiju/estateagents/sample/entity/TaH5Sample.java

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.sample.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -52,6 +53,7 @@ public class TaH5Sample implements Serializable {
     /**
      * 样例体验二维码/小程序码
      */
+    @TableField(strategy = FieldStrategy.IGNORED)
     private String sampleTryCode;
 
     /**