diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/PhotoMarkDto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/PhotoMarkDto.java
deleted file mode 100644
index 9794262..0000000
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/PhotoMarkDto.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.shxy.xymanager_common.dto;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class PhotoMarkDto {
-
-    private Integer markId;
-
-    private Integer termId;
-
-    private Integer channelId;
-
-    private Integer width;
-
-    private Integer height;
-
-    private String color;
-
-    private String path;
-
-    private Short boderWidth;
-
-    private List<TermChannelCoordinateDto> list;
-
-}
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarkPaths.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarkPaths.java
index e76a5e8..917838b 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarkPaths.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarkPaths.java
@@ -1,7 +1,9 @@
 package com.shxy.xymanager_common.entity;
 
-import java.io.Serializable;
+import lombok.Data;
 
+import java.io.Serializable;
+@Data
 public class TerminalPhotoMarkPaths implements Serializable {
     private Integer id;
 
@@ -17,51 +19,4 @@ public class TerminalPhotoMarkPaths implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getMarkId() {
-        return markId;
-    }
-
-    public void setMarkId(Integer markId) {
-        this.markId = markId;
-    }
-
-    public Float getX1() {
-        return x1;
-    }
-
-    public void setX1(Float x1) {
-        this.x1 = x1;
-    }
-
-    public Float getY1() {
-        return y1;
-    }
-
-    public void setY1(Float y1) {
-        this.y1 = y1;
-    }
-
-    public Float getX2() {
-        return x2;
-    }
-
-    public void setX2(Float x2) {
-        this.x2 = x2;
-    }
-
-    public Float getY2() {
-        return y2;
-    }
-
-    public void setY2(Float y2) {
-        this.y2 = y2;
-    }
 }
\ No newline at end of file
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarkPathsExample.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarkPathsExample.java
new file mode 100644
index 0000000..16305d7
--- /dev/null
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarkPathsExample.java
@@ -0,0 +1,560 @@
+package com.shxy.xymanager_common.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TerminalPhotoMarkPathsExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public TerminalPhotoMarkPathsExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMarkIdIsNull() {
+            addCriterion("mark_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMarkIdIsNotNull() {
+            addCriterion("mark_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMarkIdEqualTo(Integer value) {
+            addCriterion("mark_id =", value, "markId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMarkIdNotEqualTo(Integer value) {
+            addCriterion("mark_id <>", value, "markId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMarkIdGreaterThan(Integer value) {
+            addCriterion("mark_id >", value, "markId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMarkIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("mark_id >=", value, "markId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMarkIdLessThan(Integer value) {
+            addCriterion("mark_id <", value, "markId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMarkIdLessThanOrEqualTo(Integer value) {
+            addCriterion("mark_id <=", value, "markId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMarkIdIn(List<Integer> values) {
+            addCriterion("mark_id in", values, "markId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMarkIdNotIn(List<Integer> values) {
+            addCriterion("mark_id not in", values, "markId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMarkIdBetween(Integer value1, Integer value2) {
+            addCriterion("mark_id between", value1, value2, "markId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMarkIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("mark_id not between", value1, value2, "markId");
+            return (Criteria) this;
+        }
+
+        public Criteria andX1IsNull() {
+            addCriterion("x1 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andX1IsNotNull() {
+            addCriterion("x1 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andX1EqualTo(Float value) {
+            addCriterion("x1 =", value, "x1");
+            return (Criteria) this;
+        }
+
+        public Criteria andX1NotEqualTo(Float value) {
+            addCriterion("x1 <>", value, "x1");
+            return (Criteria) this;
+        }
+
+        public Criteria andX1GreaterThan(Float value) {
+            addCriterion("x1 >", value, "x1");
+            return (Criteria) this;
+        }
+
+        public Criteria andX1GreaterThanOrEqualTo(Float value) {
+            addCriterion("x1 >=", value, "x1");
+            return (Criteria) this;
+        }
+
+        public Criteria andX1LessThan(Float value) {
+            addCriterion("x1 <", value, "x1");
+            return (Criteria) this;
+        }
+
+        public Criteria andX1LessThanOrEqualTo(Float value) {
+            addCriterion("x1 <=", value, "x1");
+            return (Criteria) this;
+        }
+
+        public Criteria andX1In(List<Float> values) {
+            addCriterion("x1 in", values, "x1");
+            return (Criteria) this;
+        }
+
+        public Criteria andX1NotIn(List<Float> values) {
+            addCriterion("x1 not in", values, "x1");
+            return (Criteria) this;
+        }
+
+        public Criteria andX1Between(Float value1, Float value2) {
+            addCriterion("x1 between", value1, value2, "x1");
+            return (Criteria) this;
+        }
+
+        public Criteria andX1NotBetween(Float value1, Float value2) {
+            addCriterion("x1 not between", value1, value2, "x1");
+            return (Criteria) this;
+        }
+
+        public Criteria andY1IsNull() {
+            addCriterion("y1 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andY1IsNotNull() {
+            addCriterion("y1 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andY1EqualTo(Float value) {
+            addCriterion("y1 =", value, "y1");
+            return (Criteria) this;
+        }
+
+        public Criteria andY1NotEqualTo(Float value) {
+            addCriterion("y1 <>", value, "y1");
+            return (Criteria) this;
+        }
+
+        public Criteria andY1GreaterThan(Float value) {
+            addCriterion("y1 >", value, "y1");
+            return (Criteria) this;
+        }
+
+        public Criteria andY1GreaterThanOrEqualTo(Float value) {
+            addCriterion("y1 >=", value, "y1");
+            return (Criteria) this;
+        }
+
+        public Criteria andY1LessThan(Float value) {
+            addCriterion("y1 <", value, "y1");
+            return (Criteria) this;
+        }
+
+        public Criteria andY1LessThanOrEqualTo(Float value) {
+            addCriterion("y1 <=", value, "y1");
+            return (Criteria) this;
+        }
+
+        public Criteria andY1In(List<Float> values) {
+            addCriterion("y1 in", values, "y1");
+            return (Criteria) this;
+        }
+
+        public Criteria andY1NotIn(List<Float> values) {
+            addCriterion("y1 not in", values, "y1");
+            return (Criteria) this;
+        }
+
+        public Criteria andY1Between(Float value1, Float value2) {
+            addCriterion("y1 between", value1, value2, "y1");
+            return (Criteria) this;
+        }
+
+        public Criteria andY1NotBetween(Float value1, Float value2) {
+            addCriterion("y1 not between", value1, value2, "y1");
+            return (Criteria) this;
+        }
+
+        public Criteria andX2IsNull() {
+            addCriterion("x2 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andX2IsNotNull() {
+            addCriterion("x2 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andX2EqualTo(Float value) {
+            addCriterion("x2 =", value, "x2");
+            return (Criteria) this;
+        }
+
+        public Criteria andX2NotEqualTo(Float value) {
+            addCriterion("x2 <>", value, "x2");
+            return (Criteria) this;
+        }
+
+        public Criteria andX2GreaterThan(Float value) {
+            addCriterion("x2 >", value, "x2");
+            return (Criteria) this;
+        }
+
+        public Criteria andX2GreaterThanOrEqualTo(Float value) {
+            addCriterion("x2 >=", value, "x2");
+            return (Criteria) this;
+        }
+
+        public Criteria andX2LessThan(Float value) {
+            addCriterion("x2 <", value, "x2");
+            return (Criteria) this;
+        }
+
+        public Criteria andX2LessThanOrEqualTo(Float value) {
+            addCriterion("x2 <=", value, "x2");
+            return (Criteria) this;
+        }
+
+        public Criteria andX2In(List<Float> values) {
+            addCriterion("x2 in", values, "x2");
+            return (Criteria) this;
+        }
+
+        public Criteria andX2NotIn(List<Float> values) {
+            addCriterion("x2 not in", values, "x2");
+            return (Criteria) this;
+        }
+
+        public Criteria andX2Between(Float value1, Float value2) {
+            addCriterion("x2 between", value1, value2, "x2");
+            return (Criteria) this;
+        }
+
+        public Criteria andX2NotBetween(Float value1, Float value2) {
+            addCriterion("x2 not between", value1, value2, "x2");
+            return (Criteria) this;
+        }
+
+        public Criteria andY2IsNull() {
+            addCriterion("y2 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andY2IsNotNull() {
+            addCriterion("y2 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andY2EqualTo(Float value) {
+            addCriterion("y2 =", value, "y2");
+            return (Criteria) this;
+        }
+
+        public Criteria andY2NotEqualTo(Float value) {
+            addCriterion("y2 <>", value, "y2");
+            return (Criteria) this;
+        }
+
+        public Criteria andY2GreaterThan(Float value) {
+            addCriterion("y2 >", value, "y2");
+            return (Criteria) this;
+        }
+
+        public Criteria andY2GreaterThanOrEqualTo(Float value) {
+            addCriterion("y2 >=", value, "y2");
+            return (Criteria) this;
+        }
+
+        public Criteria andY2LessThan(Float value) {
+            addCriterion("y2 <", value, "y2");
+            return (Criteria) this;
+        }
+
+        public Criteria andY2LessThanOrEqualTo(Float value) {
+            addCriterion("y2 <=", value, "y2");
+            return (Criteria) this;
+        }
+
+        public Criteria andY2In(List<Float> values) {
+            addCriterion("y2 in", values, "y2");
+            return (Criteria) this;
+        }
+
+        public Criteria andY2NotIn(List<Float> values) {
+            addCriterion("y2 not in", values, "y2");
+            return (Criteria) this;
+        }
+
+        public Criteria andY2Between(Float value1, Float value2) {
+            addCriterion("y2 between", value1, value2, "y2");
+            return (Criteria) this;
+        }
+
+        public Criteria andY2NotBetween(Float value1, Float value2) {
+            addCriterion("y2 not between", value1, value2, "y2");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarks.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarks.java
index bd21168..7347f26 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarks.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarks.java
@@ -1,14 +1,17 @@
 package com.shxy.xymanager_common.entity;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
 
+@Data
 public class TerminalPhotoMarks implements Serializable {
     private Integer id;
 
     private Integer termId;
 
-    private Byte channelId;
+    private Integer channelId;
 
     private Integer width;
 
@@ -16,7 +19,7 @@ public class TerminalPhotoMarks implements Serializable {
 
     private String color;
 
-    private Byte boderWidth;
+    private Integer boderWidth;
 
     private Date createTime;
 
@@ -24,75 +27,4 @@ public class TerminalPhotoMarks implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getTermId() {
-        return termId;
-    }
-
-    public void setTermId(Integer termId) {
-        this.termId = termId;
-    }
-
-    public Byte getChannelId() {
-        return channelId;
-    }
-
-    public void setChannelId(Byte channelId) {
-        this.channelId = channelId;
-    }
-
-    public Integer getWidth() {
-        return width;
-    }
-
-    public void setWidth(Integer width) {
-        this.width = width;
-    }
-
-    public Integer getHeight() {
-        return height;
-    }
-
-    public void setHeight(Integer height) {
-        this.height = height;
-    }
-
-    public String getColor() {
-        return color;
-    }
-
-    public void setColor(String color) {
-        this.color = color == null ? null : color.trim();
-    }
-
-    public Byte getBoderWidth() {
-        return boderWidth;
-    }
-
-    public void setBoderWidth(Byte boderWidth) {
-        this.boderWidth = boderWidth;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
 }
\ No newline at end of file
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarksExample.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarksExample.java
new file mode 100644
index 0000000..75f538b
--- /dev/null
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarksExample.java
@@ -0,0 +1,751 @@
+package com.shxy.xymanager_common.entity;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class TerminalPhotoMarksExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public TerminalPhotoMarksExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdIsNull() {
+            addCriterion("term_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdIsNotNull() {
+            addCriterion("term_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdEqualTo(Integer value) {
+            addCriterion("term_id =", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdNotEqualTo(Integer value) {
+            addCriterion("term_id <>", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdGreaterThan(Integer value) {
+            addCriterion("term_id >", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("term_id >=", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdLessThan(Integer value) {
+            addCriterion("term_id <", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdLessThanOrEqualTo(Integer value) {
+            addCriterion("term_id <=", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdIn(List<Integer> values) {
+            addCriterion("term_id in", values, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdNotIn(List<Integer> values) {
+            addCriterion("term_id not in", values, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdBetween(Integer value1, Integer value2) {
+            addCriterion("term_id between", value1, value2, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("term_id not between", value1, value2, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdIsNull() {
+            addCriterion("channel_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdIsNotNull() {
+            addCriterion("channel_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdEqualTo(Integer value) {
+            addCriterion("channel_id =", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdNotEqualTo(Integer value) {
+            addCriterion("channel_id <>", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdGreaterThan(Integer value) {
+            addCriterion("channel_id >", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("channel_id >=", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdLessThan(Integer value) {
+            addCriterion("channel_id <", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdLessThanOrEqualTo(Integer value) {
+            addCriterion("channel_id <=", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdIn(List<Integer> values) {
+            addCriterion("channel_id in", values, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdNotIn(List<Integer> values) {
+            addCriterion("channel_id not in", values, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdBetween(Integer value1, Integer value2) {
+            addCriterion("channel_id between", value1, value2, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("channel_id not between", value1, value2, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWidthIsNull() {
+            addCriterion("width is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWidthIsNotNull() {
+            addCriterion("width is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWidthEqualTo(Integer value) {
+            addCriterion("width =", value, "width");
+            return (Criteria) this;
+        }
+
+        public Criteria andWidthNotEqualTo(Integer value) {
+            addCriterion("width <>", value, "width");
+            return (Criteria) this;
+        }
+
+        public Criteria andWidthGreaterThan(Integer value) {
+            addCriterion("width >", value, "width");
+            return (Criteria) this;
+        }
+
+        public Criteria andWidthGreaterThanOrEqualTo(Integer value) {
+            addCriterion("width >=", value, "width");
+            return (Criteria) this;
+        }
+
+        public Criteria andWidthLessThan(Integer value) {
+            addCriterion("width <", value, "width");
+            return (Criteria) this;
+        }
+
+        public Criteria andWidthLessThanOrEqualTo(Integer value) {
+            addCriterion("width <=", value, "width");
+            return (Criteria) this;
+        }
+
+        public Criteria andWidthIn(List<Integer> values) {
+            addCriterion("width in", values, "width");
+            return (Criteria) this;
+        }
+
+        public Criteria andWidthNotIn(List<Integer> values) {
+            addCriterion("width not in", values, "width");
+            return (Criteria) this;
+        }
+
+        public Criteria andWidthBetween(Integer value1, Integer value2) {
+            addCriterion("width between", value1, value2, "width");
+            return (Criteria) this;
+        }
+
+        public Criteria andWidthNotBetween(Integer value1, Integer value2) {
+            addCriterion("width not between", value1, value2, "width");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightIsNull() {
+            addCriterion("height is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightIsNotNull() {
+            addCriterion("height is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightEqualTo(Integer value) {
+            addCriterion("height =", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightNotEqualTo(Integer value) {
+            addCriterion("height <>", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightGreaterThan(Integer value) {
+            addCriterion("height >", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightGreaterThanOrEqualTo(Integer value) {
+            addCriterion("height >=", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightLessThan(Integer value) {
+            addCriterion("height <", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightLessThanOrEqualTo(Integer value) {
+            addCriterion("height <=", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightIn(List<Integer> values) {
+            addCriterion("height in", values, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightNotIn(List<Integer> values) {
+            addCriterion("height not in", values, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightBetween(Integer value1, Integer value2) {
+            addCriterion("height between", value1, value2, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightNotBetween(Integer value1, Integer value2) {
+            addCriterion("height not between", value1, value2, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andColorIsNull() {
+            addCriterion("color is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andColorIsNotNull() {
+            addCriterion("color is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andColorEqualTo(String value) {
+            addCriterion("color =", value, "color");
+            return (Criteria) this;
+        }
+
+        public Criteria andColorNotEqualTo(String value) {
+            addCriterion("color <>", value, "color");
+            return (Criteria) this;
+        }
+
+        public Criteria andColorGreaterThan(String value) {
+            addCriterion("color >", value, "color");
+            return (Criteria) this;
+        }
+
+        public Criteria andColorGreaterThanOrEqualTo(String value) {
+            addCriterion("color >=", value, "color");
+            return (Criteria) this;
+        }
+
+        public Criteria andColorLessThan(String value) {
+            addCriterion("color <", value, "color");
+            return (Criteria) this;
+        }
+
+        public Criteria andColorLessThanOrEqualTo(String value) {
+            addCriterion("color <=", value, "color");
+            return (Criteria) this;
+        }
+
+        public Criteria andColorLike(String value) {
+            addCriterion("color like", value, "color");
+            return (Criteria) this;
+        }
+
+        public Criteria andColorNotLike(String value) {
+            addCriterion("color not like", value, "color");
+            return (Criteria) this;
+        }
+
+        public Criteria andColorIn(List<String> values) {
+            addCriterion("color in", values, "color");
+            return (Criteria) this;
+        }
+
+        public Criteria andColorNotIn(List<String> values) {
+            addCriterion("color not in", values, "color");
+            return (Criteria) this;
+        }
+
+        public Criteria andColorBetween(String value1, String value2) {
+            addCriterion("color between", value1, value2, "color");
+            return (Criteria) this;
+        }
+
+        public Criteria andColorNotBetween(String value1, String value2) {
+            addCriterion("color not between", value1, value2, "color");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoderWidthIsNull() {
+            addCriterion("boder_width is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoderWidthIsNotNull() {
+            addCriterion("boder_width is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoderWidthEqualTo(Integer value) {
+            addCriterion("boder_width =", value, "boderWidth");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoderWidthNotEqualTo(Integer value) {
+            addCriterion("boder_width <>", value, "boderWidth");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoderWidthGreaterThan(Integer value) {
+            addCriterion("boder_width >", value, "boderWidth");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoderWidthGreaterThanOrEqualTo(Integer value) {
+            addCriterion("boder_width >=", value, "boderWidth");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoderWidthLessThan(Integer value) {
+            addCriterion("boder_width <", value, "boderWidth");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoderWidthLessThanOrEqualTo(Integer value) {
+            addCriterion("boder_width <=", value, "boderWidth");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoderWidthIn(List<Integer> values) {
+            addCriterion("boder_width in", values, "boderWidth");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoderWidthNotIn(List<Integer> values) {
+            addCriterion("boder_width not in", values, "boderWidth");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoderWidthBetween(Integer value1, Integer value2) {
+            addCriterion("boder_width between", value1, value2, "boderWidth");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoderWidthNotBetween(Integer value1, Integer value2) {
+            addCriterion("boder_width not between", value1, value2, "boderWidth");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/PhotoMarkModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/PhotoMarkModel.java
index 4bbdfa9..8ab3dac 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/PhotoMarkModel.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/PhotoMarkModel.java
@@ -36,7 +36,7 @@ public class PhotoMarkModel implements Serializable {
     private String color;
 
     @ApiModelProperty(value = "线条宽度", example = "213")
-    private Short boderWidth;
+    private Integer boderWidth;
 
     @ApiModelProperty(value = "图片地址", example = "213")
     private String path;
diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoMarkPathsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoMarkPathsDao.java
index bc8e857..be21c3f 100644
--- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoMarkPathsDao.java
+++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoMarkPathsDao.java
@@ -1,16 +1,29 @@
 package com.shxy.xymanager_dao.dao;
 
 import com.shxy.xymanager_common.entity.TerminalPhotoMarkPaths;
+import com.shxy.xymanager_common.entity.TerminalPhotoMarkPathsExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
 
 public interface TerminalPhotoMarkPathsDao {
+    long countByExample(TerminalPhotoMarkPathsExample example);
+
+    int deleteByExample(TerminalPhotoMarkPathsExample example);
+
     int deleteByPrimaryKey(Integer id);
 
     int insert(TerminalPhotoMarkPaths record);
 
     int insertSelective(TerminalPhotoMarkPaths record);
 
+    List<TerminalPhotoMarkPaths> selectByExample(TerminalPhotoMarkPathsExample example);
+
     TerminalPhotoMarkPaths selectByPrimaryKey(Integer id);
 
+    int updateByExampleSelective(@Param("record") TerminalPhotoMarkPaths record, @Param("example") TerminalPhotoMarkPathsExample example);
+
+    int updateByExample(@Param("record") TerminalPhotoMarkPaths record, @Param("example") TerminalPhotoMarkPathsExample example);
+
     int updateByPrimaryKeySelective(TerminalPhotoMarkPaths record);
 
     int updateByPrimaryKey(TerminalPhotoMarkPaths record);
diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoMarksDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoMarksDao.java
index 7565d95..24db8ae 100644
--- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoMarksDao.java
+++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoMarksDao.java
@@ -1,16 +1,29 @@
 package com.shxy.xymanager_dao.dao;
 
 import com.shxy.xymanager_common.entity.TerminalPhotoMarks;
+import com.shxy.xymanager_common.entity.TerminalPhotoMarksExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
 
 public interface TerminalPhotoMarksDao {
+    long countByExample(TerminalPhotoMarksExample example);
+
+    int deleteByExample(TerminalPhotoMarksExample example);
+
     int deleteByPrimaryKey(Integer id);
 
     int insert(TerminalPhotoMarks record);
 
     int insertSelective(TerminalPhotoMarks record);
 
+    List<TerminalPhotoMarks> selectByExample(TerminalPhotoMarksExample example);
+
     TerminalPhotoMarks selectByPrimaryKey(Integer id);
 
+    int updateByExampleSelective(@Param("record") TerminalPhotoMarks record, @Param("example") TerminalPhotoMarksExample example);
+
+    int updateByExample(@Param("record") TerminalPhotoMarks record, @Param("example") TerminalPhotoMarksExample example);
+
     int updateByPrimaryKeySelective(TerminalPhotoMarks record);
 
     int updateByPrimaryKey(TerminalPhotoMarks record);
diff --git a/xymanager_dao/src/main/resources/generatorConfig.xml b/xymanager_dao/src/main/resources/generatorConfig.xml
index 7643b5c..50c04dd 100644
--- a/xymanager_dao/src/main/resources/generatorConfig.xml
+++ b/xymanager_dao/src/main/resources/generatorConfig.xml
@@ -195,19 +195,17 @@
         <!--            &lt;!&ndash;            <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
         <!--        </table>-->
 
-<!--                <table tableName="terminal_photo_mark_paths"-->
-<!--                       domainObjectName="TerminalPhotoMarkPaths"-->
-<!--                       mapperName="TerminalPhotoMarkPathsDao"-->
-<!--                       enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
-<!--                       enableSelectByExample="false" selectByExampleQueryId="false">-->
-<!--                    &lt;!&ndash;            <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
-<!--                </table>-->
+                <table tableName="terminal_photo_mark_paths"
+                       domainObjectName="TerminalPhotoMarkPaths"
+                       mapperName="TerminalPhotoMarkPathsDao"
+                      >
+                    <!--            <property name="useActualColumnNames" value="false"/>-->
+                </table>
 
         <table tableName="terminal_photo_marks"
                domainObjectName="TerminalPhotoMarks"
                mapperName="TerminalPhotoMarksDao"
-               enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"
-               enableSelectByExample="false" selectByExampleQueryId="false">
+             >
             <!--            <property name="useActualColumnNames" value="false"/>-->
         </table>
 
diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
index b98dad4..f1b8e25 100644
--- a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
+++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
@@ -36,23 +36,6 @@
     <result column="media_type" jdbcType="VARCHAR" property="mediatype" />
   </resultMap>
 
-  <resultMap id="PhotoMarkMap" type="com.shxy.xymanager_common.dto.PhotoMarkDto">
-    <result column="id" jdbcType="INTEGER" property="markId" />
-    <result column="term_id" jdbcType="INTEGER" property="termId" />
-    <result column="channel_id" jdbcType="INTEGER" property="channelId" />
-    <result column="width" jdbcType="INTEGER" property="width" />
-    <result column="mark_id" jdbcType="INTEGER" property="markId" />
-    <result column="height" jdbcType="INTEGER" property="height" />
-    <result column="color" jdbcType="VARCHAR" property="color" />
-    <result column="boder_width" jdbcType="SMALLINT" property="boderWidth" />
-    <result column="path" jdbcType="VARCHAR" property="path" />
-    <collection javaType="list" ofType="com.shxy.xymanager_common.dto.TermChannelCoordinateDto" property="list">
-      <result column="x1" jdbcType="FLOAT" property="x1" />
-      <result column="x2" jdbcType="FLOAT" property="x2" />
-      <result column="y1" jdbcType="FLOAT" property="y1" />
-      <result column="y2" jdbcType="FLOAT" property="y2" />
-    </collection>
-  </resultMap>
 
   <resultMap id="TermAndChannelLatestPhotoMap" type="com.shxy.xymanager_common.dto.TermAndChannelLatestPhotoMapperDto">
     <id column="id" jdbcType="BIGINT" property="id" />
@@ -365,52 +348,6 @@
     </delete>
 
 
-  <select id="selectPhotoMark" parameterType="com.shxy.xymanager_common.vo.MarkReqVo" resultMap="PhotoMarkMap">
-        select
-        tpm.term_id as term_id,
-        tpm.channel_id as channel_id,
-        tpm.id as id,
-        tpm.width as width,
-        tpm.height as height,
-        tpm.color as color,
-        tpm.boder_width as boder_width,
-        tpm.id as mark_id,
-        tpmp.x1 as x1,
-        tpmp.x2 as x2,
-        tpmp.y1 as y1,
-        tpmp.y2 as y2,
-        tp.path as path
-        from
-        (
-        SELECT path,term_id,channel_id
-        from terminal_photos where id =  (select max(id) from terminal_photos where media_type =0 and
-        term_id =  #{termId}  and channel_id = #{channelId})
-        )tp left join terminal_photo_marks tpm  on tpm.term_id = tp.term_id and tpm.channel_id = tp.channel_id
-
-        left join terminal_photo_mark_paths  tpmp on tpmp.mark_id = tpm.id
-        where tp.term_id = #{termId}  and tp.channel_id =  #{channelId}
-    </select>
-
-  <select id="selectPhotoWithoutPic" parameterType="com.shxy.xymanager_common.vo.MarkReqVo" resultMap="PhotoMarkMap">
-        select
-        tpm.term_id as term_id,
-        tpm.channel_id as channel_id,
-        tpm.id as id,
-        tpm.width as width,
-        tpm.height as height,
-        tpm.color as color,
-        tpm.boder_width as boder_width,
-        tpm.id as mark_id,
-        tpmp.x1 as x1,
-        tpmp.x2 as x2,
-        tpmp.y1 as y1,
-        tpmp.y2 as y2
-        from
-        terminal_photo_marks tpm left join terminal_photo_mark_paths  tpmp on tpmp.mark_id = tpm.id
-        where tpm.term_id = #{termId} and tpm.channel_id =  #{channelId}
-
-    </select>
-
 
   <delete id="deletePicList">
     <if test="list != null and list.size &gt; 0">
diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPhotoMarkPathsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPhotoMarkPathsDao.xml
index c742672..279c622 100644
--- a/xymanager_dao/src/main/resources/mappers/TerminalPhotoMarkPathsDao.xml
+++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoMarkPathsDao.xml
@@ -9,9 +9,81 @@
     <result column="x2" jdbcType="REAL" property="x2" />
     <result column="y2" jdbcType="REAL" property="y2" />
   </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
   <sql id="Base_Column_List">
     id, mark_id, x1, y1, x2, y2
   </sql>
+  <select id="selectByExample" parameterType="com.shxy.xymanager_common.entity.TerminalPhotoMarkPathsExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from terminal_photo_mark_paths
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
@@ -22,6 +94,12 @@
     delete from terminal_photo_mark_paths
     where id = #{id,jdbcType=INTEGER}
   </delete>
+  <delete id="deleteByExample" parameterType="com.shxy.xymanager_common.entity.TerminalPhotoMarkPathsExample">
+    delete from terminal_photo_mark_paths
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
   <insert id="insert" parameterType="com.shxy.xymanager_common.entity.TerminalPhotoMarkPaths">
     insert into terminal_photo_mark_paths (id, mark_id, x1, 
       y1, x2, y2)
@@ -71,6 +149,50 @@
       </if>
     </trim>
   </insert>
+  <select id="countByExample" parameterType="com.shxy.xymanager_common.entity.TerminalPhotoMarkPathsExample" resultType="java.lang.Long">
+    select count(*) from terminal_photo_mark_paths
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update terminal_photo_mark_paths
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.markId != null">
+        mark_id = #{record.markId,jdbcType=INTEGER},
+      </if>
+      <if test="record.x1 != null">
+        x1 = #{record.x1,jdbcType=REAL},
+      </if>
+      <if test="record.y1 != null">
+        y1 = #{record.y1,jdbcType=REAL},
+      </if>
+      <if test="record.x2 != null">
+        x2 = #{record.x2,jdbcType=REAL},
+      </if>
+      <if test="record.y2 != null">
+        y2 = #{record.y2,jdbcType=REAL},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update terminal_photo_mark_paths
+    set id = #{record.id,jdbcType=INTEGER},
+      mark_id = #{record.markId,jdbcType=INTEGER},
+      x1 = #{record.x1,jdbcType=REAL},
+      y1 = #{record.y1,jdbcType=REAL},
+      x2 = #{record.x2,jdbcType=REAL},
+      y2 = #{record.y2,jdbcType=REAL}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.shxy.xymanager_common.entity.TerminalPhotoMarkPaths">
     update terminal_photo_mark_paths
     <set>
diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPhotoMarksDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPhotoMarksDao.xml
index 5ce089a..b5154be 100644
--- a/xymanager_dao/src/main/resources/mappers/TerminalPhotoMarksDao.xml
+++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoMarksDao.xml
@@ -1,165 +1,275 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.shxy.xymanager_dao.dao.TerminalPhotoMarksDao">
-    <resultMap id="BaseResultMap" type="com.shxy.xymanager_common.entity.TerminalPhotoMarks">
-        <id column="id" jdbcType="INTEGER" property="id"/>
-        <result column="term_id" jdbcType="INTEGER" property="termId"/>
-        <result column="channel_id" jdbcType="TINYINT" property="channelId"/>
-        <result column="width" jdbcType="INTEGER" property="width"/>
-        <result column="height" jdbcType="INTEGER" property="height"/>
-        <result column="color" jdbcType="VARCHAR" property="color"/>
-        <result column="boder_width" jdbcType="TINYINT" property="boderWidth"/>
-        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
-        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
-    </resultMap>
-    <sql id="Base_Column_List">
-
-
-
-
-                                    id, term_id, channel_id, width, height, color, boder_width, create_time, update_time
-
-
-
-
-    </sql>
-    <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
-        from terminal_photo_marks
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-
-
-                                    delete from terminal_photo_marks
-                                    where id = #{id,jdbcType=INTEGER}
-
-
-    </delete>
-    <insert id="insert" parameterType="com.shxy.xymanager_common.entity.TerminalPhotoMarks">
-
-
-                                    insert into terminal_photo_marks (id, term_id, channel_id,
-                                      width, height, color,
-                                      boder_width, create_time, update_time
-                                      )
-                                    values (#{id,jdbcType=INTEGER}, #{termId,jdbcType=INTEGER}, #{channelId,jdbcType=TINYINT},
-                                      #{width,jdbcType=INTEGER}, #{height,jdbcType=INTEGER}, #{color,jdbcType=VARCHAR},
-                                      #{boderWidth,jdbcType=TINYINT}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
-                                      )
-
-
-    </insert>
-    <insert id="insertSelective" parameterType="com.shxy.xymanager_common.entity.TerminalPhotoMarks">
-        insert into terminal_photo_marks
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">
-                id,
-            </if>
-            <if test="termId != null">
-                term_id,
-            </if>
-            <if test="channelId != null">
-                channel_id,
-            </if>
-            <if test="width != null">
-                width,
-            </if>
-            <if test="height != null">
-                height,
-            </if>
-            <if test="color != null">
-                color,
-            </if>
-            <if test="boderWidth != null">
-                boder_width,
-            </if>
-            <if test="createTime != null">
-                create_time,
-            </if>
-            <if test="updateTime != null">
-                update_time,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">
-                #{id,jdbcType=INTEGER},
-            </if>
-            <if test="termId != null">
-                #{termId,jdbcType=INTEGER},
-            </if>
-            <if test="channelId != null">
-                #{channelId,jdbcType=TINYINT},
-            </if>
-            <if test="width != null">
-                #{width,jdbcType=INTEGER},
-            </if>
-            <if test="height != null">
-                #{height,jdbcType=INTEGER},
-            </if>
-            <if test="color != null">
-                #{color,jdbcType=VARCHAR},
-            </if>
-            <if test="boderWidth != null">
-                #{boderWidth,jdbcType=TINYINT},
-            </if>
-            <if test="createTime != null">
-                #{createTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="updateTime != null">
-                #{updateTime,jdbcType=TIMESTAMP},
-            </if>
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.shxy.xymanager_common.entity.TerminalPhotoMarks">
-        update terminal_photo_marks
-        <set>
-            <if test="termId != null">
-                term_id = #{termId,jdbcType=INTEGER},
-            </if>
-            <if test="channelId != null">
-                channel_id = #{channelId,jdbcType=TINYINT},
-            </if>
-            <if test="width != null">
-                width = #{width,jdbcType=INTEGER},
-            </if>
-            <if test="height != null">
-                height = #{height,jdbcType=INTEGER},
-            </if>
-            <if test="color != null">
-                color = #{color,jdbcType=VARCHAR},
-            </if>
-            <if test="boderWidth != null">
-                boder_width = #{boderWidth,jdbcType=TINYINT},
-            </if>
-            <if test="createTime != null">
-                create_time = #{createTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="updateTime != null">
-                update_time = #{updateTime,jdbcType=TIMESTAMP},
-            </if>
-        </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <update id="updateByPrimaryKey" parameterType="com.shxy.xymanager_common.entity.TerminalPhotoMarks">
-
-
-
-
-                                    update terminal_photo_marks
-                                    set term_id = #{termId,jdbcType=INTEGER},
-                                      channel_id = #{channelId,jdbcType=TINYINT},
-                                      width = #{width,jdbcType=INTEGER},
-                                      height = #{height,jdbcType=INTEGER},
-                                      color = #{color,jdbcType=VARCHAR},
-                                      boder_width = #{boderWidth,jdbcType=TINYINT},
-                                      create_time = #{createTime,jdbcType=TIMESTAMP},
-                                      update_time = #{updateTime,jdbcType=TIMESTAMP}
-                                    where id = #{id,jdbcType=INTEGER}
-
-
-
-
-    </update>
+  <resultMap id="BaseResultMap" type="com.shxy.xymanager_common.entity.TerminalPhotoMarks">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="term_id" jdbcType="INTEGER" property="termId" />
+    <result column="channel_id" jdbcType="INTEGER" property="channelId" />
+    <result column="width" jdbcType="INTEGER" property="width" />
+    <result column="height" jdbcType="INTEGER" property="height" />
+    <result column="color" jdbcType="VARCHAR" property="color" />
+    <result column="boder_width" jdbcType="INTEGER" property="boderWidth" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, term_id, channel_id, width, height, color, boder_width, create_time, update_time
+  </sql>
+  <select id="selectByExample" parameterType="com.shxy.xymanager_common.entity.TerminalPhotoMarksExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from terminal_photo_marks
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from terminal_photo_marks
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from terminal_photo_marks
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.shxy.xymanager_common.entity.TerminalPhotoMarksExample">
+    delete from terminal_photo_marks
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.shxy.xymanager_common.entity.TerminalPhotoMarks">
+    insert into terminal_photo_marks (id, term_id, channel_id, 
+      width, height, color, 
+      boder_width, create_time, update_time
+      )
+    values (#{id,jdbcType=INTEGER}, #{termId,jdbcType=INTEGER}, #{channelId,jdbcType=TINYINT}, 
+      #{width,jdbcType=INTEGER}, #{height,jdbcType=INTEGER}, #{color,jdbcType=VARCHAR}, 
+      #{boderWidth,jdbcType=TINYINT}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.shxy.xymanager_common.entity.TerminalPhotoMarks">
+    insert into terminal_photo_marks
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="termId != null">
+        term_id,
+      </if>
+      <if test="channelId != null">
+        channel_id,
+      </if>
+      <if test="width != null">
+        width,
+      </if>
+      <if test="height != null">
+        height,
+      </if>
+      <if test="color != null">
+        color,
+      </if>
+      <if test="boderWidth != null">
+        boder_width,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="termId != null">
+        #{termId,jdbcType=INTEGER},
+      </if>
+      <if test="channelId != null">
+        #{channelId,jdbcType=TINYINT},
+      </if>
+      <if test="width != null">
+        #{width,jdbcType=INTEGER},
+      </if>
+      <if test="height != null">
+        #{height,jdbcType=INTEGER},
+      </if>
+      <if test="color != null">
+        #{color,jdbcType=VARCHAR},
+      </if>
+      <if test="boderWidth != null">
+        #{boderWidth,jdbcType=TINYINT},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.shxy.xymanager_common.entity.TerminalPhotoMarksExample" resultType="java.lang.Long">
+    select count(*) from terminal_photo_marks
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update terminal_photo_marks
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.termId != null">
+        term_id = #{record.termId,jdbcType=INTEGER},
+      </if>
+      <if test="record.channelId != null">
+        channel_id = #{record.channelId,jdbcType=TINYINT},
+      </if>
+      <if test="record.width != null">
+        width = #{record.width,jdbcType=INTEGER},
+      </if>
+      <if test="record.height != null">
+        height = #{record.height,jdbcType=INTEGER},
+      </if>
+      <if test="record.color != null">
+        color = #{record.color,jdbcType=VARCHAR},
+      </if>
+      <if test="record.boderWidth != null">
+        boder_width = #{record.boderWidth,jdbcType=TINYINT},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update terminal_photo_marks
+    set id = #{record.id,jdbcType=INTEGER},
+      term_id = #{record.termId,jdbcType=INTEGER},
+      channel_id = #{record.channelId,jdbcType=TINYINT},
+      width = #{record.width,jdbcType=INTEGER},
+      height = #{record.height,jdbcType=INTEGER},
+      color = #{record.color,jdbcType=VARCHAR},
+      boder_width = #{record.boderWidth,jdbcType=TINYINT},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.shxy.xymanager_common.entity.TerminalPhotoMarks">
+    update terminal_photo_marks
+    <set>
+      <if test="termId != null">
+        term_id = #{termId,jdbcType=INTEGER},
+      </if>
+      <if test="channelId != null">
+        channel_id = #{channelId,jdbcType=TINYINT},
+      </if>
+      <if test="width != null">
+        width = #{width,jdbcType=INTEGER},
+      </if>
+      <if test="height != null">
+        height = #{height,jdbcType=INTEGER},
+      </if>
+      <if test="color != null">
+        color = #{color,jdbcType=VARCHAR},
+      </if>
+      <if test="boderWidth != null">
+        boder_width = #{boderWidth,jdbcType=TINYINT},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.shxy.xymanager_common.entity.TerminalPhotoMarks">
+    update terminal_photo_marks
+    set term_id = #{termId,jdbcType=INTEGER},
+      channel_id = #{channelId,jdbcType=TINYINT},
+      width = #{width,jdbcType=INTEGER},
+      height = #{height,jdbcType=INTEGER},
+      color = #{color,jdbcType=VARCHAR},
+      boder_width = #{boderWidth,jdbcType=TINYINT},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
 </mapper>
\ No newline at end of file
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java
index cec78cc..bc9f8ec 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java
@@ -65,6 +65,12 @@ public class TerminalServiceImpl implements TerminalService {
     @Autowired
     TerminalPhotoDao terminalPhotoDao;
 
+    @Autowired
+    TerminalPhotoMarksDao terminalPhotoMarksDao;
+
+    @Autowired
+    TerminalPhotoMarkPathsDao terminalPhotoMarkPathsDao;
+
     @Autowired
     DyLevelDao dyLevelDao;
 
@@ -509,7 +515,6 @@ public class TerminalServiceImpl implements TerminalService {
 
     @Override
     public ServiceBody<PhotoMarkModel> getCoordinate(String requestIp, MarkReqVo vo) {
-
         Integer termId = vo.getTermId();
         Integer channelId = vo.getChannelId();
         Map<String, String> globalParams = cacheService.getGolobalMap();
@@ -521,31 +526,51 @@ public class TerminalServiceImpl implements TerminalService {
             integer = Integer.valueOf(s);
         }
         PhotoMarkModel model = new PhotoMarkModel();
+        model.setTermId(termId);
+        model.setChannelId(channelId);
         model.setMarkEnable(integer);
-        PhotoMarkDto dto = null;
         if (vo.getNeedPic() == 0) {
-            dto = terminalPhotoDao.selectPhotoMark(vo);
-            if (null != dto && StringUtils.isNotBlank(dto.getPath())) {
-                String photoPath = TerminalUtils.getPhotoPath(0, requestIp, dto.getPath());
-                dto.setPath(photoPath);
-            }
-
             PageUtils.SetPage(1, 1);
             TerminalPhotoExample example = new TerminalPhotoExample();
             TerminalPhotoExample.Criteria criteria = example.createCriteria();
             criteria.andChannelIdEqualTo(channelId).andTermIdEqualTo(termId).andMediaTypeEqualTo(CommonStatus.DELETE.value());
-            example.setOrderByClause( "id desc");
-            terminalPhotoDao.selectByExample(example);
-
-
-
-        } else {
-            dto = terminalPhotoDao.selectPhotoWithoutPic(vo);
+            example.setOrderByClause("id desc");
+            List<TerminalPhoto> photoList = terminalPhotoDao.selectByExample(example);
+            if (CollectionUtil.isNotEmpty(photoList)) {
+                TerminalPhoto terminalPhoto = photoList.get(0);
+                if (null != terminalPhoto && StringUtils.isNotBlank(terminalPhoto.getPath())) {
+                    String photoPath = TerminalUtils.getPhotoPath(0, requestIp, terminalPhoto.getPath());
+                    model.setPath(photoPath);
+                }
+            }
         }
-
-        if (null != dto) {
-            BeanUtils.copyProperties(dto, model);
+        ArrayList<TermChannelCoordinateDto> list = new ArrayList<>();
+        TerminalPhotoMarksExample example1 = new TerminalPhotoMarksExample();
+        example1.createCriteria().andTermIdEqualTo(termId).andChannelIdEqualTo(channelId);
+        List<TerminalPhotoMarks> terminalPhotoMarks = terminalPhotoMarksDao.selectByExample(example1);
+        if (CollectionUtil.isNotEmpty(terminalPhotoMarks)) {
+            TerminalPhotoMarks terminalPhotoMarks1 = terminalPhotoMarks.get(0);
+            Integer marks1Id = terminalPhotoMarks1.getId();
+            model.setMarkId(marks1Id);
+            model.setBoderWidth(terminalPhotoMarks1.getBoderWidth());
+            model.setColor(terminalPhotoMarks1.getColor());
+            model.setHeight(terminalPhotoMarks1.getHeight());
+            model.setWidth(terminalPhotoMarks1.getWidth());
+            TerminalPhotoMarkPathsExample example2 = new TerminalPhotoMarkPathsExample();
+            example2.createCriteria().andMarkIdEqualTo(marks1Id);
+            List<TerminalPhotoMarkPaths> terminalPhotoMarkPaths = terminalPhotoMarkPathsDao.selectByExample(example2);
+            if (CollectionUtil.isNotEmpty(terminalPhotoMarkPaths)) {
+                for (TerminalPhotoMarkPaths item : terminalPhotoMarkPaths) {
+                    TermChannelCoordinateDto termChannelCoordinateDto = new TermChannelCoordinateDto();
+                    termChannelCoordinateDto.setX1(item.getX1());
+                    termChannelCoordinateDto.setX2(item.getX2());
+                    termChannelCoordinateDto.setY1(item.getY1());
+                    termChannelCoordinateDto.setY2(item.getY2());
+                    list.add(termChannelCoordinateDto);
+                }
+            }
         }
+        model.setList(list);
         return Asserts.success(model);
     }