diff --git a/ghy-custom/src/main/java/com/ghy/customer/domain/Customer.java b/ghy-custom/src/main/java/com/ghy/customer/domain/Customer.java
index 2be64a27..b6d2b77b 100644
--- a/ghy-custom/src/main/java/com/ghy/customer/domain/Customer.java
+++ b/ghy-custom/src/main/java/com/ghy/customer/domain/Customer.java
@@ -19,7 +19,7 @@ public class Customer extends BaseEntity {
@Excel(name = "用户名", cellType = Excel.ColumnType.STRING)
private String name;
- @Excel(name = "用户微信账号", cellType = Excel.ColumnType.STRING)
+ @Excel(name = "用户账号", cellType = Excel.ColumnType.STRING)
private String account;
@Excel(name = "用户手机号", cellType = Excel.ColumnType.STRING)
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 a945a42e..a8e66696 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
@@ -1,13 +1,43 @@
package com.ghy.worker.domain;
+import com.ghy.common.annotation.Excel;
import com.ghy.common.core.domain.BaseEntity;
+import lombok.Data;
/**
* @author clunt
* 师傅实体
*/
+@Data
public class Worker extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+ @Excel(name = "师傅id", cellType = Excel.ColumnType.NUMERIC)
+ private Long workerId;
+
+ @Excel(name = "师傅名字", cellType = Excel.ColumnType.STRING)
+ private String name;
+
+ @Excel(name = "师傅账号", cellType = Excel.ColumnType.STRING)
+ private String account;
+
+ @Excel(name = "师傅手机号", cellType = Excel.ColumnType.STRING)
+ private String phone;
+
+ @Excel(name = "微信open_id", cellType = Excel.ColumnType.STRING)
+ private String openId;
+
+ @Excel(name = "用户状态 0生效 1冻结 2删除", readConverterExp = "0=生效,1=冻结,2=删除")
+ private Integer status;
+
+ @Excel(name = "用户头像", cellType = Excel.ColumnType.STRING)
+ private String workerLogoUrl;
+
+ @Excel(name = "领导团队扣点", cellType = Excel.ColumnType.STRING)
+ private String leaderTeamRate;
+
+ @Excel(name = "领导团队扣费金额", cellType = Excel.ColumnType.STRING)
+ private String leaderTeamMoney;
}
diff --git a/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerTeam.java b/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerTeam.java
new file mode 100644
index 00000000..16a4c4c1
--- /dev/null
+++ b/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerTeam.java
@@ -0,0 +1,30 @@
+package com.ghy.worker.domain;
+
+import com.ghy.common.annotation.Excel;
+import com.ghy.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * @author clunt
+ * 师傅团队
+ */
+@Data
+public class WorkerTeam extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ @Excel(name = "师傅团队id", cellType = Excel.ColumnType.NUMERIC)
+ private Long workerTeamId;
+
+ @Excel(name = "团队归属师傅id", cellType = Excel.ColumnType.NUMERIC)
+ private Long leaderId;
+
+ @Excel(name = "团队成员师傅id", cellType = Excel.ColumnType.NUMERIC)
+ private Long workerId;
+
+ @Excel(name = "成员师傅备注", cellType = Excel.ColumnType.STRING)
+ private String workerName;
+
+
+
+}
diff --git a/ghy-worker/src/main/resources/mapper.worker/WorkerMapper.xml b/ghy-worker/src/main/resources/mapper.worker/WorkerMapper.xml
index 9ec94a9b..44a41e35 100644
--- a/ghy-worker/src/main/resources/mapper.worker/WorkerMapper.xml
+++ b/ghy-worker/src/main/resources/mapper.worker/WorkerMapper.xml
@@ -11,7 +11,7 @@
-
+