From dfe372a6c34dbaed2fb4870ab29c18c6983e2d78 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期二, 18 四月 2023 18:27:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

---
 phis-feign/src/main/java/com/hz/phis/dt/shop/ShopDt.java |  203 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 195 insertions(+), 8 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/phis/dt/shop/ShopDt.java b/phis-feign/src/main/java/com/hz/phis/dt/shop/ShopDt.java
index 04b33dd..eb07259 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/shop/ShopDt.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/shop/ShopDt.java
@@ -1,14 +1,201 @@
 package com.hz.phis.dt.shop;
 
-import com.hz.his.dto.PageDto;
-import lombok.Data;
+import com.hz.phis.dt.BaseDt;
 
 /**
+ * 鍚屾闂ㄥ簵鍒楄〃瀹炰綋
+ *
  * @author fwq
- * 闂ㄥ簵鎵╁睍
- * */
-@Data
-public class ShopDt extends PageDto {
-    /**淇敼鏃堕棿*/
-    private String updateTime;
+ */
+public class ShopDt extends BaseDt {
+    /**缂栧彿*/
+    private String code;
+    /**鍚嶇О*/
+    private String name;
+    /**鎵�灞炵埗绾ч儴闂ㄦ爣璇�(Department)*/
+    private String departmentId;
+    /**浼佷笟寰俊閮ㄩ棬id*/
+    private Integer corpMpDepId;
+    /**鏈�澶ч绾︽暟閲�*/
+    private Integer maxAppNum;
+    /**鏈�澶ц浆鐤楁暟閲�*/
+    private Integer maxSwitchNum;
+    /**鏄惁鍚敤*/
+    private Integer isUp;
+    /**宸ヤ綔鏃堕棿濡�09:00-12:00|14:00-16:00*/
+    private String workTime;
+    /**鍦板潃-鐪�*/
+    private String province;
+    /**鍦板潃-甯�*/
+    private String city;
+    /**鍦板潃-鍖�*/
+    private String area;
+    /**鍦板潃璇︾粏*/
+    private String addr;
+    /**棰滆壊瀛楃涓�*/
+    private String colorStr;
+    /**鍖荤敓浼戞伅鏃堕棿*/
+    private String doctorRelaxTime;
+    /**椹捐溅璺嚎*/
+    private String carWay;
+    /**鍦伴搧璺緞*/
+    private String subWay;
+    /**api绯荤粺鐨刬d*/
+    private String apiId;
+    /**鐢熺編棰勭害闄愬埗鏁伴噺*/
+    private Integer shengMeiNum;
+    /**鍚屼竴鏃堕棿娈靛鎴锋暟*/
+    private Integer sameTimeCustomerNum;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDepartmentId() {
+        return departmentId;
+    }
+
+    public void setDepartmentId(String departmentId) {
+        this.departmentId = departmentId;
+    }
+
+    public Integer getCorpMpDepId() {
+        return corpMpDepId;
+    }
+
+    public void setCorpMpDepId(Integer corpMpDepId) {
+        this.corpMpDepId = corpMpDepId;
+    }
+
+    public Integer getMaxAppNum() {
+        return maxAppNum;
+    }
+
+    public void setMaxAppNum(Integer maxAppNum) {
+        this.maxAppNum = maxAppNum;
+    }
+
+    public Integer getMaxSwitchNum() {
+        return maxSwitchNum;
+    }
+
+    public void setMaxSwitchNum(Integer maxSwitchNum) {
+        this.maxSwitchNum = maxSwitchNum;
+    }
+
+    public Integer getIsUp() {
+        return isUp;
+    }
+
+    public void setIsUp(Integer isUp) {
+        this.isUp = isUp;
+    }
+
+    public String getWorkTime() {
+        return workTime;
+    }
+
+    public void setWorkTime(String workTime) {
+        this.workTime = workTime;
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getArea() {
+        return area;
+    }
+
+    public void setArea(String area) {
+        this.area = area;
+    }
+
+    public String getAddr() {
+        return addr;
+    }
+
+    public void setAddr(String addr) {
+        this.addr = addr;
+    }
+
+    public String getColorStr() {
+        return colorStr;
+    }
+
+    public void setColorStr(String colorStr) {
+        this.colorStr = colorStr;
+    }
+
+    public String getDoctorRelaxTime() {
+        return doctorRelaxTime;
+    }
+
+    public void setDoctorRelaxTime(String doctorRelaxTime) {
+        this.doctorRelaxTime = doctorRelaxTime;
+    }
+
+    public String getCarWay() {
+        return carWay;
+    }
+
+    public void setCarWay(String carWay) {
+        this.carWay = carWay;
+    }
+
+    public String getSubWay() {
+        return subWay;
+    }
+
+    public void setSubWay(String subWay) {
+        this.subWay = subWay;
+    }
+
+    public String getApiId() {
+        return apiId;
+    }
+
+    public void setApiId(String apiId) {
+        this.apiId = apiId;
+    }
+
+    public Integer getShengMeiNum() {
+        return shengMeiNum;
+    }
+
+    public void setShengMeiNum(Integer shengMeiNum) {
+        this.shengMeiNum = shengMeiNum;
+    }
+
+    public Integer getSameTimeCustomerNum() {
+        return sameTimeCustomerNum;
+    }
+
+    public void setSameTimeCustomerNum(Integer sameTimeCustomerNum) {
+        this.sameTimeCustomerNum = sameTimeCustomerNum;
+    }
 }

--
Gitblit v1.8.0