diff --git a/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java b/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java index 61c3489d..cd9ca5dd 100644 --- a/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java +++ b/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java @@ -3,6 +3,7 @@ package com.ghy.worker.domain; import com.ghy.common.annotation.Excel; import com.ghy.common.core.domain.BaseEntity; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.List; @@ -11,6 +12,7 @@ import java.util.List; * 师傅实体 */ @Data +@EqualsAndHashCode(callSuper = true) public class Worker extends BaseEntity { private static final long serialVersionUID = 1L; @@ -36,6 +38,12 @@ public class Worker extends BaseEntity { @Excel(name = "微信open_id", cellType = Excel.ColumnType.STRING) private String openId; + @Excel(name = "支付宝账号") + private String alipayAccount; + + @Excel(name = "支付宝姓名") + private String alipayName; + @Excel(name = "分公司名称", cellType = Excel.ColumnType.STRING) private String deptName; @@ -59,7 +67,9 @@ public class Worker extends BaseEntity { private String bannerUrl; - // 注册验证码 + /** + * 注册验证码 + */ private String registerCode; private List workerIds; diff --git a/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml b/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml index 98666134..ac45bde8 100644 --- a/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml +++ b/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml @@ -2,33 +2,37 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + SELECT - w.worker_id, w.name, w.account, w.phone, w.password, w.open_id, w.dept_id, sd.dept_name, sdc.banner_url, w.status, w.worker_logo_url, - w.leader_team_rate, w.leader_team_money, w.create_by, w.create_time, w.update_by, w.update_time, w.remark, w.type, w.store_status + w.worker_id, w.name, w.account, w.phone, w.password, w.open_id, w.dept_id, w.status, w.worker_logo_url, + w.leader_team_rate, w.leader_team_money, w.create_by, w.create_time, w.update_by, w.update_time, + w.remark, w.type, w.store_status, w.alipay_account, w.alipay_name, + sd.dept_name, sdc.banner_url FROM worker w LEFT JOIN sys_dept sd ON w.dept_id = sd.dept_id LEFT JOIN sys_dept_config sdc ON w.dept_id = sdc.dept_id @@ -100,6 +104,8 @@ phone, password, open_id, + alipay_account, + alipay_name, dept_id, status, worker_logo_url, @@ -113,6 +119,8 @@ #{password}, #{openId}, #{deptId}, + #{alipayAccount}, + #{alipayName}, #{status}, #{workerLogoUrl}, #{remark}, @@ -133,6 +141,8 @@ name = #{name}, leader_team_rate = #{leaderTeamRate}, leader_team_money = #{leaderTeamMoney}, + alipay_account = #{alipayAccount}, + alipay_name = #{alipayName}, where worker_id = #{workerId}