解决包名冲突问题

pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/dtos/picturestemplate/PicturesTemplateDTO.java

@@ -1,12 +1,6 @@
-<<<<<<< HEAD:pojo-building-pictures/src/main/java/cn/com/tenlion/pojo/dtos/picturestemplate/PicturesTemplateDTO.java
-package cn.com.tenlion.pojo.dtos.picturestemplate;
-
-import cn.com.tenlion.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO;
-=======
 package cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplate;
 
 import cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO;
->>>>>>> 5d0d076509efae042da29b94995d574fe34f3ba6:pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/dtos/picturestemplate/PicturesTemplateDTO.java
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;

pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/dtos/picturestemplate/PicturesTemplateFileDTO.java

@@ -1,8 +1,4 @@
-<<<<<<< HEAD:pojo-building-pictures/src/main/java/cn/com/tenlion/pojo/dtos/picturestemplate/PicturesTemplateFileDTO.java
-package cn.com.tenlion.pojo.dtos.picturestemplate;
-=======
 package cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplate;
->>>>>>> 5d0d076509efae042da29b94995d574fe34f3ba6:pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/dtos/picturestemplate/PicturesTemplateFileDTO.java
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/dtos/picturestemplatearea/PicturesTemplateAreaDTO.java

@@ -1,8 +1,4 @@
-<<<<<<< HEAD:pojo-building-pictures/src/main/java/cn/com/tenlion/pojo/dtos/picturestemplatearea/PicturesTemplateAreaDTO.java
-package cn.com.tenlion.pojo.dtos.picturestemplatearea;
-=======
 package cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplatearea;
->>>>>>> 5d0d076509efae042da29b94995d574fe34f3ba6:pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/dtos/picturestemplatearea/PicturesTemplateAreaDTO.java
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/dtos/picturestemplatearea/PicturesTemplateAreaFileDTO.java

@@ -1,8 +1,4 @@
-<<<<<<< HEAD:pojo-building-pictures/src/main/java/cn/com/tenlion/pojo/dtos/picturestemplatearea/PicturesTemplateAreaFileDTO.java
-package cn.com.tenlion.pojo.dtos.picturestemplatearea;
-=======
 package cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplatearea;
->>>>>>> 5d0d076509efae042da29b94995d574fe34f3ba6:pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/dtos/picturestemplatearea/PicturesTemplateAreaFileDTO.java
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/vos/picturestemplate/PicturesTemplateContentVO.java

@@ -1,8 +1,4 @@
-<<<<<<< HEAD:pojo-building-pictures/src/main/java/cn/com/tenlion/pojo/vos/picturestemplate/PicturesTemplateContentVO.java
-package cn.com.tenlion.pojo.vos.picturestemplate;
-=======
 package cn.com.tenlion.buildingpictures.pojo.vos.picturestemplate;
->>>>>>> 5d0d076509efae042da29b94995d574fe34f3ba6:pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/vos/picturestemplate/PicturesTemplateContentVO.java
 
 import ink.wgink.annotation.CheckEmptyAnnotation;
 import io.swagger.annotations.ApiModel;

pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/vos/picturestemplatearea/PicturesTemplateAreaAllVO.java

@@ -1,8 +1,4 @@
-<<<<<<< HEAD:pojo-building-pictures/src/main/java/cn/com/tenlion/pojo/vos/picturestemplatearea/PicturesTemplateAreaAllVO.java
-package cn.com.tenlion.pojo.vos.picturestemplatearea;
-=======
 package cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatearea;
->>>>>>> 5d0d076509efae042da29b94995d574fe34f3ba6:pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/vos/picturestemplatearea/PicturesTemplateAreaAllVO.java
 
 import ink.wgink.annotation.CheckEmptyAnnotation;
 import io.swagger.annotations.ApiModel;

pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/vos/picturestemplatearea/PicturesTemplateAreaPiointVO.java

@@ -1,8 +1,4 @@
-<<<<<<< HEAD:pojo-building-pictures/src/main/java/cn/com/tenlion/pojo/vos/picturestemplatearea/PicturesTemplateAreaPiointVO.java
-package cn.com.tenlion.pojo.vos.picturestemplatearea;
-=======
 package cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatearea;
->>>>>>> 5d0d076509efae042da29b94995d574fe34f3ba6:pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/vos/picturestemplatearea/PicturesTemplateAreaPiointVO.java
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/vos/picturestemplatearea/PicturesTemplateAreaVO.java

@@ -1,8 +1,4 @@
-<<<<<<< HEAD:pojo-building-pictures/src/main/java/cn/com/tenlion/pojo/vos/picturestemplatearea/PicturesTemplateAreaVO.java
-package cn.com.tenlion.pojo.vos.picturestemplatearea;
-=======
 package cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatearea;
->>>>>>> 5d0d076509efae042da29b94995d574fe34f3ba6:pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/vos/picturestemplatearea/PicturesTemplateAreaVO.java
 
 import ink.wgink.annotation.CheckEmptyAnnotation;
 import ink.wgink.annotation.CheckNumberAnnotation;

pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/vos/picturestemplatebuilding/PicturesTemplateBuildingVO.java

@@ -1,8 +1,4 @@
-<<<<<<< HEAD:pojo-building-pictures/src/main/java/cn/com/tenlion/pojo/vos/picturestemplatebuilding/PicturesTemplateBuildingVO.java
-package cn.com.tenlion.pojo.vos.picturestemplatebuilding;
-=======
 package cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatebuilding;
->>>>>>> 5d0d076509efae042da29b94995d574fe34f3ba6:pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/vos/picturestemplatebuilding/PicturesTemplateBuildingVO.java
 
 import ink.wgink.annotation.CheckEmptyAnnotation;
 import ink.wgink.annotation.CheckNumberAnnotation;

pojo-building-pictures/src/main/java/cn/com/tenlion/pojo/dtos/picturestemplate/PicturesTemplateDTO.java

@@ -1,184 +0,0 @@
-<<<<<<< HEAD:pojo-building-pictures/src/main/java/cn/com/tenlion/pojo/dtos/picturestemplate/PicturesTemplateDTO.java
-package cn.com.tenlion.pojo.dtos.picturestemplate;
-
-import cn.com.tenlion.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO;
-=======
-package cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplate;
-
-import cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO;
->>>>>>> 5d0d076509efae042da29b94995d574fe34f3ba6:pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/dtos/picturestemplate/PicturesTemplateDTO.java
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- *
- * @ClassName: PicturesTemplateDTO
- * @Description: 图片套版的套版管理
- * @Author: WenG
- * @Date: 2020-10-20 10:49
- * @Version: 1.0
- **/
-@ApiModel
-public class PicturesTemplateDTO {
-
-    @ApiModelProperty(name = "picturesTemplateId", value = "主键")
-    private String picturesTemplateId;
-    @ApiModelProperty(name = "picturesTemplateCode", value = "套版编码")
-    private String picturesTemplateCode;
-    @ApiModelProperty(name = "picturesTemplateBackgroundImage", value = "套版底图")
-    private String picturesTemplateBackgroundImage;
-    @ApiModelProperty(name = "picturesTemplateTitle", value = "套版名称")
-    private String picturesTemplateTitle;
-    @ApiModelProperty(name = "picturesTemplateHeight", value = "画板高度")
-    private Double picturesTemplateHeight;
-    @ApiModelProperty(name = "picturesTemplateWidth", value = "画板宽度")
-    private Double picturesTemplateWidth;
-    @ApiModelProperty(name = "picturesTemplatePublishStatus", value = "套版发布状态")
-    private String picturesTemplatePublishStatus;
-    @ApiModelProperty(name = "picturesTemplatePublishTime", value = "套版发布时间")
-    private String picturesTemplatePublishTime;
-    @ApiModelProperty(name = "picturesTemplateUrl", value = "套版访问地址")
-    private String picturesTemplateUrl;
-    @ApiModelProperty(name = "picturesTemplateContent", value = "套版代码")
-    private String picturesTemplateContent;
-    @ApiModelProperty(name = "areaList", value = "模块区域")
-    private List<PicturesTemplateAreaDTO> areaList;
-    @ApiModelProperty(name = "picturesTemplateFile", value = "套版附件")
-    private String picturesTemplateFile;
-    @ApiModelProperty(name = "fileList", value = "套版附件")
-    private List<PicturesTemplateFileDTO>  fileList;
-    @ApiModelProperty(name = "picturesTemplateBack", value = "生成尺寸")
-    private String picturesTemplateBack;
-    @ApiModelProperty(name = "picturesTemplateSize", value = "自定义尺寸")
-    private String picturesTemplateSize;
-
-    public String getPicturesTemplateSize() {
-        return picturesTemplateSize == null ? "" : picturesTemplateSize;
-    }
-
-    public void setPicturesTemplateSize(String picturesTemplateSize) {
-        this.picturesTemplateSize = picturesTemplateSize;
-    }
-
-    public String getPicturesTemplateBack() {
-        return picturesTemplateBack == null ? "" : picturesTemplateBack;
-    }
-
-    public void setPicturesTemplateBack(String picturesTemplateBack) {
-        this.picturesTemplateBack = picturesTemplateBack;
-    }
-
-    public List<PicturesTemplateFileDTO> getFileList() {
-        if (fileList == null) {
-            return new ArrayList<>();
-        }
-        return fileList;
-    }
-
-    public void setFileList(List<PicturesTemplateFileDTO> fileList) {
-        this.fileList = fileList;
-    }
-
-    public String getPicturesTemplateFile() {
-        return picturesTemplateFile == null ? "" : picturesTemplateFile;
-    }
-
-    public void setPicturesTemplateFile(String picturesTemplateFile) {
-        this.picturesTemplateFile = picturesTemplateFile;
-    }
-
-    public List<PicturesTemplateAreaDTO> getAreaList() {
-        if (areaList == null) {
-            return new ArrayList<>();
-        }
-        return areaList;
-    }
-
-    public void setAreaList(List<PicturesTemplateAreaDTO> areaList) {
-        this.areaList = areaList;
-    }
-
-    public String getPicturesTemplateId() {
-        return picturesTemplateId == null ? "" : picturesTemplateId.trim();
-    }
-
-    public void setPicturesTemplateId(String picturesTemplateId) {
-        this.picturesTemplateId = picturesTemplateId;
-    }
-
-    public String getPicturesTemplateCode() {
-        return picturesTemplateCode == null ? "" : picturesTemplateCode.trim();
-    }
-
-    public void setPicturesTemplateCode(String picturesTemplateCode) {
-        this.picturesTemplateCode = picturesTemplateCode;
-    }
-
-    public String getPicturesTemplateBackgroundImage() {
-        return picturesTemplateBackgroundImage == null ? "" : picturesTemplateBackgroundImage.trim();
-    }
-
-    public void setPicturesTemplateBackgroundImage(String picturesTemplateBackgroundImage) {
-        this.picturesTemplateBackgroundImage = picturesTemplateBackgroundImage;
-    }
-
-    public String getPicturesTemplateTitle() {
-        return picturesTemplateTitle == null ? "" : picturesTemplateTitle.trim();
-    }
-
-    public void setPicturesTemplateTitle(String picturesTemplateTitle) {
-        this.picturesTemplateTitle = picturesTemplateTitle;
-    }
-
-    public Double getPicturesTemplateHeight() {
-        return picturesTemplateHeight == null ? 0D : picturesTemplateHeight;
-    }
-
-    public void setPicturesTemplateHeight(Double picturesTemplateHeight) {
-        this.picturesTemplateHeight = picturesTemplateHeight;
-    }
-
-    public Double getPicturesTemplateWidth() {
-        return picturesTemplateWidth == null ? 0D : picturesTemplateWidth;
-    }
-
-    public void setPicturesTemplateWidth(Double picturesTemplateWidth) {
-        this.picturesTemplateWidth = picturesTemplateWidth;
-    }
-
-    public String getPicturesTemplatePublishStatus() {
-        return picturesTemplatePublishStatus == null ? "" : picturesTemplatePublishStatus.trim();
-    }
-
-    public void setPicturesTemplatePublishStatus(String picturesTemplatePublishStatus) {
-        this.picturesTemplatePublishStatus = picturesTemplatePublishStatus;
-    }
-
-    public String getPicturesTemplatePublishTime() {
-        return picturesTemplatePublishTime == null ? "" : picturesTemplatePublishTime.trim();
-    }
-
-    public void setPicturesTemplatePublishTime(String picturesTemplatePublishTime) {
-        this.picturesTemplatePublishTime = picturesTemplatePublishTime;
-    }
-
-    public String getPicturesTemplateUrl() {
-        return picturesTemplateUrl == null ? "" : picturesTemplateUrl.trim();
-    }
-
-    public void setPicturesTemplateUrl(String picturesTemplateUrl) {
-        this.picturesTemplateUrl = picturesTemplateUrl;
-    }
-
-    public String getPicturesTemplateContent() {
-        return picturesTemplateContent == null ? "" : picturesTemplateContent.trim();
-    }
-
-    public void setPicturesTemplateContent(String picturesTemplateContent) {
-        this.picturesTemplateContent = picturesTemplateContent;
-    }
-
-
-}

pojo-building-pictures/src/main/java/cn/com/tenlion/pojo/dtos/picturestemplate/PicturesTemplateFileDTO.java

@@ -1,53 +0,0 @@
-<<<<<<< HEAD:pojo-building-pictures/src/main/java/cn/com/tenlion/pojo/dtos/picturestemplate/PicturesTemplateFileDTO.java
-package cn.com.tenlion.pojo.dtos.picturestemplate;
-=======
-package cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplate;
->>>>>>> 5d0d076509efae042da29b94995d574fe34f3ba6:pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/dtos/picturestemplate/PicturesTemplateFileDTO.java
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- *
- * @ClassName: PicturesTemplateDTO
- * @Description: 图片套版的页面管理
- * @Author: WenG
- * @Date: 2020-10-20 10:49
- * @Version: 1.0
- **/
-@ApiModel
-public class PicturesTemplateFileDTO {
-
-    @ApiModelProperty(name = "picturesTemplateFile", value = "文件ID")
-    private String picturesTemplateFile;
-    @ApiModelProperty(name = "picturesTemplateFilePath", value = "文件路径")
-    private String picturesTemplateFilePath;
-    @ApiModelProperty(name = "picturesTemplateFileType", value = "文件类型")
-    private String picturesTemplateFileType;
-
-    public String getPicturesTemplateFile() {
-        return picturesTemplateFile == null ? "" : picturesTemplateFile;
-    }
-
-    public void setPicturesTemplateFile(String picturesTemplateFile) {
-        this.picturesTemplateFile = picturesTemplateFile;
-    }
-
-    public String getPicturesTemplateFilePath() {
-        return picturesTemplateFilePath == null ? "" : picturesTemplateFilePath;
-    }
-
-    public void setPicturesTemplateFilePath(String picturesTemplateFilePath) {
-        this.picturesTemplateFilePath = picturesTemplateFilePath;
-    }
-
-    public String getPicturesTemplateFileType() {
-        return picturesTemplateFileType == null ? "" : picturesTemplateFileType;
-    }
-
-    public void setPicturesTemplateFileType(String picturesTemplateFileType) {
-        this.picturesTemplateFileType = picturesTemplateFileType;
-    }
-}

pojo-building-pictures/src/main/java/cn/com/tenlion/pojo/dtos/picturestemplatearea/PicturesTemplateAreaDTO.java

@@ -1,256 +0,0 @@
-<<<<<<< HEAD:pojo-building-pictures/src/main/java/cn/com/tenlion/pojo/dtos/picturestemplatearea/PicturesTemplateAreaDTO.java
-package cn.com.tenlion.pojo.dtos.picturestemplatearea;
-=======
-package cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplatearea;
->>>>>>> 5d0d076509efae042da29b94995d574fe34f3ba6:pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/dtos/picturestemplatearea/PicturesTemplateAreaDTO.java
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- *
- * @ClassName: PicturesTemplateAreaDTO
- * @Description: 图片套版模板的区域设置
- * @Author: WenG
- * @Date: 2020-10-20 15:08
- * @Version: 1.0
- **/
-@ApiModel
-public class PicturesTemplateAreaDTO {
-
-    @ApiModelProperty(name = "picturesTemplateAreaId", value = "主键")
-    private String picturesTemplateAreaId;
-    @ApiModelProperty(name = "picturesTemplateId", value = "模板ID")
-    private String picturesTemplateId;
-    @ApiModelProperty(name = "templateAreaSource", value = "区域标识")
-    private String templateAreaSource;
-    @ApiModelProperty(name = "templateAreaLeft", value = "距左部像素px")
-    private Double templateAreaLeft;
-    @ApiModelProperty(name = "templateAreaTop", value = "距顶部像素px")
-    private Double templateAreaTop;
-    @ApiModelProperty(name = "templateAreaDown", value = "距底部像素px")
-    private Double templateAreaDown;
-    @ApiModelProperty(name = "templateAreaRight", value = "距右部像素px")
-    private Double templateAreaRight;
-    @ApiModelProperty(name = "templateAreaHeight", value = "高度")
-    private Double templateAreaHeight;
-    @ApiModelProperty(name = "templateAreaWidth", value = "宽度")
-    private Double templateAreaWidth;
-    @ApiModelProperty(name = "templateAreaColor", value = "区域颜色")
-    private String templateAreaColor;
-    @ApiModelProperty(name = "templateAreaRemark", value = "备注")
-    private String templateAreaRemark;
-    @ApiModelProperty(name = "templateAreaStatus", value = "区域状态")
-    private String templateAreaStatus;
-    @ApiModelProperty(name = "picturesTemplateTitle", value = "模板名称")
-    private String picturesTemplateTitle;
-    @ApiModelProperty(name = "picturesModuleContent", value = "模块内容")
-    private String picturesModuleContent;
-    @ApiModelProperty(name = "templateAreaFile", value = "区域插件")
-    private String templateAreaFile;
-    @ApiModelProperty(name = "fileList", value = "区域插件集合")
-    private List<PicturesTemplateAreaFileDTO> fileList;
-    @ApiModelProperty(name = "templateAreaServerLink", value = "区域类型")
-    private String templateAreaServerLink;
-    @ApiModelProperty(name = "templateAreaFontCenter", value = "文字位置")
-    private String templateAreaFontCenter;
-    @ApiModelProperty(name = "templateAreaFontSize", value = "字体大小")
-    private String templateAreaFontSize;
-    @ApiModelProperty(name = "templateAreaFontBold", value = "文字加粗")
-    private String templateAreaFontBold;
-    @ApiModelProperty(name = "templateAreaFontFamily", value = "文字字体")
-    private String templateAreaFontFamily;
-    @ApiModelProperty(name = "templateAreaFontColor", value = "文字颜色")
-    private String templateAreaFontColor;
-    @ApiModelProperty(name = "templateAreaFontValue", value = "示例文字")
-    private String templateAreaFontValue;
-
-    public String getTemplateAreaFontCenter() {
-        return templateAreaFontCenter == null ? "" : templateAreaFontCenter;
-    }
-
-    public void setTemplateAreaFontCenter(String templateAreaFontCenter) {
-        this.templateAreaFontCenter = templateAreaFontCenter;
-    }
-
-    public String getTemplateAreaFontSize() {
-        return templateAreaFontSize == null ? "" : templateAreaFontSize;
-    }
-
-    public void setTemplateAreaFontSize(String templateAreaFontSize) {
-        this.templateAreaFontSize = templateAreaFontSize;
-    }
-
-    public String getTemplateAreaFontBold() {
-        return templateAreaFontBold == null ? "" : templateAreaFontBold;
-    }
-
-    public void setTemplateAreaFontBold(String templateAreaFontBold) {
-        this.templateAreaFontBold = templateAreaFontBold;
-    }
-
-    public String getTemplateAreaFontFamily() {
-        return templateAreaFontFamily == null ? "" : templateAreaFontFamily;
-    }
-
-    public void setTemplateAreaFontFamily(String templateAreaFontFamily) {
-        this.templateAreaFontFamily = templateAreaFontFamily;
-    }
-
-    public String getTemplateAreaFontColor() {
-        return templateAreaFontColor == null ? "" : templateAreaFontColor;
-    }
-
-    public void setTemplateAreaFontColor(String templateAreaFontColor) {
-        this.templateAreaFontColor = templateAreaFontColor;
-    }
-
-    public String getTemplateAreaFontValue() {
-        return templateAreaFontValue == null ? "" : templateAreaFontValue;
-    }
-
-    public void setTemplateAreaFontValue(String templateAreaFontValue) {
-        this.templateAreaFontValue = templateAreaFontValue;
-    }
-
-    public String getPicturesTemplateAreaId() {
-        return picturesTemplateAreaId == null ? "" : picturesTemplateAreaId;
-    }
-
-    public void setPicturesTemplateAreaId(String picturesTemplateAreaId) {
-        this.picturesTemplateAreaId = picturesTemplateAreaId;
-    }
-
-    public String getPicturesTemplateId() {
-        return picturesTemplateId == null ? "" : picturesTemplateId;
-    }
-
-    public void setPicturesTemplateId(String picturesTemplateId) {
-        this.picturesTemplateId = picturesTemplateId;
-    }
-
-    public String getTemplateAreaSource() {
-        return templateAreaSource == null ? "" : templateAreaSource;
-    }
-
-    public void setTemplateAreaSource(String templateAreaSource) {
-        this.templateAreaSource = templateAreaSource;
-    }
-
-    public Double getTemplateAreaLeft() {
-        return templateAreaLeft;
-    }
-
-    public void setTemplateAreaLeft(Double templateAreaLeft) {
-        this.templateAreaLeft = templateAreaLeft;
-    }
-
-    public Double getTemplateAreaTop() {
-        return templateAreaTop;
-    }
-
-    public void setTemplateAreaTop(Double templateAreaTop) {
-        this.templateAreaTop = templateAreaTop;
-    }
-
-    public Double getTemplateAreaDown() {
-        return templateAreaDown;
-    }
-
-    public void setTemplateAreaDown(Double templateAreaDown) {
-        this.templateAreaDown = templateAreaDown;
-    }
-
-    public Double getTemplateAreaRight() {
-        return templateAreaRight;
-    }
-
-    public void setTemplateAreaRight(Double templateAreaRight) {
-        this.templateAreaRight = templateAreaRight;
-    }
-
-    public Double getTemplateAreaHeight() {
-        return templateAreaHeight;
-    }
-
-    public void setTemplateAreaHeight(Double templateAreaHeight) {
-        this.templateAreaHeight = templateAreaHeight;
-    }
-
-    public Double getTemplateAreaWidth() {
-        return templateAreaWidth;
-    }
-
-    public void setTemplateAreaWidth(Double templateAreaWidth) {
-        this.templateAreaWidth = templateAreaWidth;
-    }
-
-    public String getTemplateAreaColor() {
-        return templateAreaColor == null ? "" : templateAreaColor;
-    }
-
-    public void setTemplateAreaColor(String templateAreaColor) {
-        this.templateAreaColor = templateAreaColor;
-    }
-
-    public String getTemplateAreaRemark() {
-        return templateAreaRemark == null ? "" : templateAreaRemark;
-    }
-
-    public void setTemplateAreaRemark(String templateAreaRemark) {
-        this.templateAreaRemark = templateAreaRemark;
-    }
-
-    public String getTemplateAreaStatus() {
-        return templateAreaStatus == null ? "" : templateAreaStatus;
-    }
-
-    public void setTemplateAreaStatus(String templateAreaStatus) {
-        this.templateAreaStatus = templateAreaStatus;
-    }
-
-    public String getPicturesTemplateTitle() {
-        return picturesTemplateTitle == null ? "" : picturesTemplateTitle;
-    }
-
-    public void setPicturesTemplateTitle(String picturesTemplateTitle) {
-        this.picturesTemplateTitle = picturesTemplateTitle;
-    }
-
-    public String getPicturesModuleContent() {
-        return picturesModuleContent == null ? "" : picturesModuleContent;
-    }
-
-    public void setPicturesModuleContent(String picturesModuleContent) {
-        this.picturesModuleContent = picturesModuleContent;
-    }
-
-    public String getTemplateAreaFile() {
-        return templateAreaFile == null ? "" : templateAreaFile;
-    }
-
-    public void setTemplateAreaFile(String templateAreaFile) {
-        this.templateAreaFile = templateAreaFile;
-    }
-
-    public List<PicturesTemplateAreaFileDTO> getFileList() {
-        if (fileList == null) {
-            return new ArrayList<>();
-        }
-        return fileList;
-    }
-
-    public void setFileList(List<PicturesTemplateAreaFileDTO> fileList) {
-        this.fileList = fileList;
-    }
-
-    public String getTemplateAreaServerLink() {
-        return templateAreaServerLink == null ? "" : templateAreaServerLink;
-    }
-
-    public void setTemplateAreaServerLink(String templateAreaServerLink) {
-        this.templateAreaServerLink = templateAreaServerLink;
-    }
-}

pojo-building-pictures/src/main/java/cn/com/tenlion/pojo/dtos/picturestemplatearea/PicturesTemplateAreaFileDTO.java

@@ -1,42 +0,0 @@
-<<<<<<< HEAD:pojo-building-pictures/src/main/java/cn/com/tenlion/pojo/dtos/picturestemplatearea/PicturesTemplateAreaFileDTO.java
-package cn.com.tenlion.pojo.dtos.picturestemplatearea;
-=======
-package cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplatearea;
->>>>>>> 5d0d076509efae042da29b94995d574fe34f3ba6:pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/dtos/picturestemplatearea/PicturesTemplateAreaFileDTO.java
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- *
- * @ClassName: PicturesTemplateAreaDTO
- * @Description: 图片套版模板的区域设置
- * @Author: WenG
- * @Date: 2020-10-20 15:08
- * @Version: 1.0
- **/
-@ApiModel
-public class PicturesTemplateAreaFileDTO {
-
-    @ApiModelProperty(name = "templateAreaFile", value = "区域插件文件ID")
-    private String templateAreaFile;
-    @ApiModelProperty(name = "templateAreaFile", value = "区域插件文件类型")
-    private String templateAreaFileType;
-
-    public String getTemplateAreaFile() {
-        return templateAreaFile == null ? "" : templateAreaFile;
-    }
-
-    public void setTemplateAreaFile(String templateAreaFile) {
-        this.templateAreaFile = templateAreaFile;
-    }
-
-    public String getTemplateAreaFileType() {
-        return templateAreaFileType == null ? "" : templateAreaFileType;
-    }
-
-    public void setTemplateAreaFileType(String templateAreaFileType) {
-        this.templateAreaFileType = templateAreaFileType;
-    }
-
-}

pojo-building-pictures/src/main/java/cn/com/tenlion/pojo/vos/picturestemplate/PicturesTemplateContentVO.java

@@ -1,35 +0,0 @@
-<<<<<<< HEAD:pojo-building-pictures/src/main/java/cn/com/tenlion/pojo/vos/picturestemplate/PicturesTemplateContentVO.java
-package cn.com.tenlion.pojo.vos.picturestemplate;
-=======
-package cn.com.tenlion.buildingpictures.pojo.vos.picturestemplate;
->>>>>>> 5d0d076509efae042da29b94995d574fe34f3ba6:pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/vos/picturestemplate/PicturesTemplateContentVO.java
-
-import ink.wgink.annotation.CheckEmptyAnnotation;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- *
- * @ClassName: PicturesTemplateVO
- * @Description: 图片套版的页面管理
- * @Author: WenG
- * @Date: 2020-10-20 10:49
- * @Version: 1.0
- **/
-@ApiModel
-public class PicturesTemplateContentVO {
-
-    @ApiModelProperty(name = "picturesTemplateContent", value = "代码内容")
-    @CheckEmptyAnnotation(name = "代码内容")
-    private String picturesTemplateContent;
-
-    public String getPicturesTemplateContent() {
-        return picturesTemplateContent == null ? "" : picturesTemplateContent.trim();
-    }
-
-    public void setPicturesTemplateContent(String picturesTemplateContent) {
-        this.picturesTemplateContent = picturesTemplateContent;
-    }
-
-
-}

pojo-building-pictures/src/main/java/cn/com/tenlion/pojo/vos/picturestemplate/PicturesTemplateVO.java

@@ -1,148 +0,0 @@
-package cn.com.tenlion.pojo.vos.picturestemplate;
-
-import ink.wgink.annotation.CheckEmptyAnnotation;
-import ink.wgink.annotation.CheckNumberAnnotation;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- *
- * @ClassName: PicturesTemplateVO
- * @Description: 图片套版的套版管理
- * @Author: WenG
- * @Date: 2020-10-20 10:49
- * @Version: 1.0
- **/
-@ApiModel
-public class PicturesTemplateVO {
-
-    @ApiModelProperty(name = "picturesTemplateCode", value = "套版编码")
-    @CheckEmptyAnnotation(name = "套版编码")
-    private String picturesTemplateCode;
-    @ApiModelProperty(name = "picturesTemplateBackgroundImage", value = "套版底图")
-    @CheckEmptyAnnotation(name = "套版底图")
-    private String picturesTemplateBackgroundImage;
-    @ApiModelProperty(name = "picturesTemplateTitle", value = "套版名称")
-    @CheckEmptyAnnotation(name = "套版名称")
-    private String picturesTemplateTitle;
-    @ApiModelProperty(name = "picturesTemplateHeight", value = "画板高度")
-//    @CheckNumberAnnotation(name = "套版高度")
-    private Double picturesTemplateHeight;
-    @ApiModelProperty(name = "picturesTemplateWidth", value = "画板宽度")
-//    @CheckNumberAnnotation(name = "套版宽度")
-    private Double picturesTemplateWidth;
-    @ApiModelProperty(name = "picturesTemplatePublishStatus", value = "套版发布状态")
-    @CheckEmptyAnnotation(name = "套版发布状态")
-    private String picturesTemplatePublishStatus;
-    @ApiModelProperty(name = "picturesTemplatePublishTime", value = "套版发布时间")
-    private String picturesTemplatePublishTime;
-    @ApiModelProperty(name = "picturesTemplateUrl", value = "套版访问地址")
-    private String picturesTemplateUrl;
-    @ApiModelProperty(name = "picturesTemplateContent", value = "套版代码")
-    private String picturesTemplateContent;
-    @ApiModelProperty(name = "picturesTemplateFile", value = "套版附件")
-    private String picturesTemplateFile;
-    @ApiModelProperty(name = "picturesTemplateBack", value = "生成尺寸")
-    @CheckEmptyAnnotation(name = "生成尺寸")
-    private String picturesTemplateBack;
-    @ApiModelProperty(name = "picturesTemplateSize", value = "显示尺寸")
-    private String picturesTemplateSize;
-
-    public String getPicturesTemplateSize() {
-        return picturesTemplateSize == null ? "" : picturesTemplateSize;
-    }
-
-    public void setPicturesTemplateSize(String picturesTemplateSize) {
-        this.picturesTemplateSize = picturesTemplateSize;
-    }
-
-    public String getPicturesTemplateBack() {
-        return picturesTemplateBack == null ? "" : picturesTemplateBack;
-    }
-
-    public void setPicturesTemplateBack(String picturesTemplateBack) {
-        this.picturesTemplateBack = picturesTemplateBack;
-    }
-
-    public String getPicturesTemplateFile() {
-        return picturesTemplateFile == null ? "" : picturesTemplateFile;
-    }
-
-    public void setPicturesTemplateFile(String picturesTemplateFile) {
-        this.picturesTemplateFile = picturesTemplateFile;
-    }
-
-    public String getPicturesTemplateCode() {
-        return picturesTemplateCode == null ? "" : picturesTemplateCode.trim();
-    }
-
-    public void setPicturesTemplateCode(String picturesTemplateCode) {
-        this.picturesTemplateCode = picturesTemplateCode;
-    }
-
-    public String getPicturesTemplateBackgroundImage() {
-        return picturesTemplateBackgroundImage == null ? "" : picturesTemplateBackgroundImage.trim();
-    }
-
-    public void setPicturesTemplateBackgroundImage(String picturesTemplateBackgroundImage) {
-        this.picturesTemplateBackgroundImage = picturesTemplateBackgroundImage;
-    }
-
-    public String getPicturesTemplateTitle() {
-        return picturesTemplateTitle == null ? "" : picturesTemplateTitle.trim();
-    }
-
-    public void setPicturesTemplateTitle(String picturesTemplateTitle) {
-        this.picturesTemplateTitle = picturesTemplateTitle;
-    }
-
-    public Double getPicturesTemplateHeight() {
-        return picturesTemplateHeight == null ? 0D : picturesTemplateHeight;
-    }
-
-    public void setPicturesTemplateHeight(Double picturesTemplateHeight) {
-        this.picturesTemplateHeight = picturesTemplateHeight;
-    }
-
-    public Double getPicturesTemplateWidth() {
-        return picturesTemplateWidth == null ? 0D : picturesTemplateWidth;
-    }
-
-    public void setPicturesTemplateWidth(Double picturesTemplateWidth) {
-        this.picturesTemplateWidth = picturesTemplateWidth;
-    }
-
-    public String getPicturesTemplatePublishStatus() {
-        return picturesTemplatePublishStatus == null ? "" : picturesTemplatePublishStatus.trim();
-    }
-
-    public void setPicturesTemplatePublishStatus(String picturesTemplatePublishStatus) {
-        this.picturesTemplatePublishStatus = picturesTemplatePublishStatus;
-    }
-
-    public String getPicturesTemplatePublishTime() {
-        return picturesTemplatePublishTime == null ? "" : picturesTemplatePublishTime.trim();
-    }
-
-    public void setPicturesTemplatePublishTime(String picturesTemplatePublishTime) {
-        this.picturesTemplatePublishTime = picturesTemplatePublishTime;
-    }
-
-    public String getPicturesTemplateUrl() {
-        return picturesTemplateUrl == null ? "" : picturesTemplateUrl.trim();
-    }
-
-    public void setPicturesTemplateUrl(String picturesTemplateUrl) {
-        this.picturesTemplateUrl = picturesTemplateUrl;
-    }
-
-    public String getPicturesTemplateContent() {
-        return picturesTemplateContent == null ? "" : picturesTemplateContent.trim();
-    }
-
-    public void setPicturesTemplateContent(String picturesTemplateContent) {
-        this.picturesTemplateContent = picturesTemplateContent;
-    }
-
-
-}

pojo-building-pictures/src/main/java/cn/com/tenlion/pojo/vos/picturestemplatearea/PicturesTemplateAreaAllVO.java

@@ -1,82 +0,0 @@
-<<<<<<< HEAD:pojo-building-pictures/src/main/java/cn/com/tenlion/pojo/vos/picturestemplatearea/PicturesTemplateAreaAllVO.java
-package cn.com.tenlion.pojo.vos.picturestemplatearea;
-=======
-package cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatearea;
->>>>>>> 5d0d076509efae042da29b94995d574fe34f3ba6:pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/vos/picturestemplatearea/PicturesTemplateAreaAllVO.java
-
-import ink.wgink.annotation.CheckEmptyAnnotation;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- *
- * @ClassName: PicturesTemplateAreaAllVO
- * @Description: 图片套版模板的区域设置全部修改
- * @Author: WenG
- * @Date: 2020-10-20 15:08
- * @Version: 1.0
- **/
-@ApiModel
-public class PicturesTemplateAreaAllVO {
-
-    @ApiModelProperty(name = "picturesTemplateId", value = "模板ID")
-    private String picturesTemplateId;
-    @ApiModelProperty(name = "templateAreaFontCenter", value = "文字位置")
-    private String templateAreaFontCenter;
-    @ApiModelProperty(name = "templateAreaFontSize", value = "字体大小")
-    private String templateAreaFontSize;
-    @ApiModelProperty(name = "templateAreaFontBold", value = "文字加粗")
-    private String templateAreaFontBold;
-    @ApiModelProperty(name = "templateAreaFontFamily", value = "文字字体")
-    private String templateAreaFontFamily;
-    @ApiModelProperty(name = "templateAreaFontColor", value = "文字颜色")
-    private String templateAreaFontColor;
-
-    public String getPicturesTemplateId() {
-        return picturesTemplateId == null ? "" : picturesTemplateId;
-    }
-
-    public void setPicturesTemplateId(String picturesTemplateId) {
-        this.picturesTemplateId = picturesTemplateId;
-    }
-
-    public String getTemplateAreaFontCenter() {
-        return templateAreaFontCenter == null ? "" : templateAreaFontCenter;
-    }
-
-    public void setTemplateAreaFontCenter(String templateAreaFontCenter) {
-        this.templateAreaFontCenter = templateAreaFontCenter;
-    }
-
-    public String getTemplateAreaFontSize() {
-        return templateAreaFontSize == null ? "" : templateAreaFontSize;
-    }
-
-    public void setTemplateAreaFontSize(String templateAreaFontSize) {
-        this.templateAreaFontSize = templateAreaFontSize;
-    }
-
-    public String getTemplateAreaFontBold() {
-        return templateAreaFontBold == null ? "" : templateAreaFontBold;
-    }
-
-    public void setTemplateAreaFontBold(String templateAreaFontBold) {
-        this.templateAreaFontBold = templateAreaFontBold;
-    }
-
-    public String getTemplateAreaFontFamily() {
-        return templateAreaFontFamily == null ? "" : templateAreaFontFamily;
-    }
-
-    public void setTemplateAreaFontFamily(String templateAreaFontFamily) {
-        this.templateAreaFontFamily = templateAreaFontFamily;
-    }
-
-    public String getTemplateAreaFontColor() {
-        return templateAreaFontColor == null ? "" : templateAreaFontColor;
-    }
-
-    public void setTemplateAreaFontColor(String templateAreaFontColor) {
-        this.templateAreaFontColor = templateAreaFontColor;
-    }
-}

pojo-building-pictures/src/main/java/cn/com/tenlion/pojo/vos/picturestemplatearea/PicturesTemplateAreaPiointVO.java

@@ -1,91 +0,0 @@
-<<<<<<< HEAD:pojo-building-pictures/src/main/java/cn/com/tenlion/pojo/vos/picturestemplatearea/PicturesTemplateAreaPiointVO.java
-package cn.com.tenlion.pojo.vos.picturestemplatearea;
-=======
-package cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatearea;
->>>>>>> 5d0d076509efae042da29b94995d574fe34f3ba6:pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/vos/picturestemplatearea/PicturesTemplateAreaPiointVO.java
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- *
- * @ClassName: PicturesTemplateAreaVO
- * @Description: 图片套版模板的区域设置
- * @Author: WenG
- * @Date: 2020-10-20 15:08
- * @Version: 1.0
- **/
-@ApiModel
-public class PicturesTemplateAreaPiointVO {
-
-    @ApiModelProperty(name = "picturesTemplateId", value = "所属模板")
-    private String  picturesTemplateId;
-    @ApiModelProperty(name = "templateAreaLeft", value = "距左部像素px")
-    private Double templateAreaLeft;
-    @ApiModelProperty(name = "templateAreaTop", value = "距顶部像素px")
-    private Double templateAreaTop;
-    @ApiModelProperty(name = "templateAreaDown", value = "距底部像素px")
-    private Double templateAreaDown;
-    @ApiModelProperty(name = "templateAreaRight", value = "距右部像素px")
-    private Double templateAreaRight;
-    @ApiModelProperty(name = "templateAreaHeight", value = "高度")
-    private Double templateAreaHeight;
-    @ApiModelProperty(name = "templateAreaWidth", value = "宽度")
-    private Double templateAreaWidth;
-
-    public String getPicturesTemplateId() {
-        return picturesTemplateId == null ? "" : picturesTemplateId;
-    }
-
-    public void setPicturesTemplateId(String picturesTemplateId) {
-        this.picturesTemplateId = picturesTemplateId;
-    }
-
-    public Double getTemplateAreaLeft() {
-        return templateAreaLeft;
-    }
-
-    public void setTemplateAreaLeft(Double templateAreaLeft) {
-        this.templateAreaLeft = templateAreaLeft;
-    }
-
-    public Double getTemplateAreaTop() {
-        return templateAreaTop;
-    }
-
-    public void setTemplateAreaTop(Double templateAreaTop) {
-        this.templateAreaTop = templateAreaTop;
-    }
-
-    public Double getTemplateAreaDown() {
-        return templateAreaDown;
-    }
-
-    public void setTemplateAreaDown(Double templateAreaDown) {
-        this.templateAreaDown = templateAreaDown;
-    }
-
-    public Double getTemplateAreaRight() {
-        return templateAreaRight;
-    }
-
-    public void setTemplateAreaRight(Double templateAreaRight) {
-        this.templateAreaRight = templateAreaRight;
-    }
-
-    public Double getTemplateAreaHeight() {
-        return templateAreaHeight;
-    }
-
-    public void setTemplateAreaHeight(Double templateAreaHeight) {
-        this.templateAreaHeight = templateAreaHeight;
-    }
-
-    public Double getTemplateAreaWidth() {
-        return templateAreaWidth;
-    }
-
-    public void setTemplateAreaWidth(Double templateAreaWidth) {
-        this.templateAreaWidth = templateAreaWidth;
-    }
-}

pojo-building-pictures/src/main/java/cn/com/tenlion/pojo/vos/picturestemplatearea/PicturesTemplateAreaVO.java

@@ -1,219 +0,0 @@
-<<<<<<< HEAD:pojo-building-pictures/src/main/java/cn/com/tenlion/pojo/vos/picturestemplatearea/PicturesTemplateAreaVO.java
-package cn.com.tenlion.pojo.vos.picturestemplatearea;
-=======
-package cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatearea;
->>>>>>> 5d0d076509efae042da29b94995d574fe34f3ba6:pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/vos/picturestemplatearea/PicturesTemplateAreaVO.java
-
-import ink.wgink.annotation.CheckEmptyAnnotation;
-import ink.wgink.annotation.CheckNumberAnnotation;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- *
- * @ClassName: PicturesTemplateAreaVO
- * @Description: 图片套版模板的区域设置
- * @Author: WenG
- * @Date: 2020-10-20 15:08
- * @Version: 1.0
- **/
-@ApiModel
-public class PicturesTemplateAreaVO {
-
-    @ApiModelProperty(name = "picturesTemplateId", value = "模板ID")
-    @CheckEmptyAnnotation(name = "模板")
-    private String picturesTemplateId;
-    @ApiModelProperty(name = "templateAreaSource", value = "区域标识")
-    @CheckEmptyAnnotation(name = "区域标识")
-    private String templateAreaSource;
-    @ApiModelProperty(name = "templateAreaLeft", value = "距左部像素px")
-    private Double templateAreaLeft;
-    @ApiModelProperty(name = "templateAreaTop", value = "距顶部像素px")
-    private Double templateAreaTop;
-    @ApiModelProperty(name = "templateAreaDown", value = "距底部像素px")
-    private Double templateAreaDown;
-    @ApiModelProperty(name = "templateAreaRight", value = "距右部像素px")
-    private Double templateAreaRight;
-    @ApiModelProperty(name = "templateAreaHeight", value = "高度")
-    private Double templateAreaHeight;
-    @ApiModelProperty(name = "templateAreaWidth", value = "宽度")
-    private Double templateAreaWidth;
-    @ApiModelProperty(name = "templateAreaColor", value = "区域颜色")
-    @CheckEmptyAnnotation(name = "区域颜色")
-    private String templateAreaColor;
-    @ApiModelProperty(name = "templateAreaRemark", value = "备注")
-    private String templateAreaRemark;
-    @ApiModelProperty(name = "templateAreaStatus", value = "区域状态")
-    private String templateAreaStatus;
-    @ApiModelProperty(name = "templateAreaFile", value = "示例图片")
-    private String templateAreaFile;
-    @ApiModelProperty(name = "templateAreaServerLink", value = "区域类型")
-    private String templateAreaServerLink;
-    @ApiModelProperty(name = "templateAreaFontCenter", value = "文字位置")
-    private String templateAreaFontCenter;
-    @ApiModelProperty(name = "templateAreaFontSize", value = "字体大小")
-    private String templateAreaFontSize;
-    @ApiModelProperty(name = "templateAreaFontBold", value = "文字加粗")
-    private String templateAreaFontBold;
-    @ApiModelProperty(name = "templateAreaFontFamily", value = "文字字体")
-    private String templateAreaFontFamily;
-    @ApiModelProperty(name = "templateAreaFontColor", value = "文字颜色")
-    private String templateAreaFontColor;
-    @ApiModelProperty(name = "templateAreaFontValue", value = "示例文字")
-    private String templateAreaFontValue;
-
-    public String getTemplateAreaFontCenter() {
-        return templateAreaFontCenter == null ? "" : templateAreaFontCenter;
-    }
-
-    public void setTemplateAreaFontCenter(String templateAreaFontCenter) {
-        this.templateAreaFontCenter = templateAreaFontCenter;
-    }
-
-    public String getTemplateAreaFontSize() {
-        return templateAreaFontSize == null ? "" : templateAreaFontSize;
-    }
-
-    public void setTemplateAreaFontSize(String templateAreaFontSize) {
-        this.templateAreaFontSize = templateAreaFontSize;
-    }
-
-    public String getTemplateAreaFontBold() {
-        return templateAreaFontBold == null ? "" : templateAreaFontBold;
-    }
-
-    public void setTemplateAreaFontBold(String templateAreaFontBold) {
-        this.templateAreaFontBold = templateAreaFontBold;
-    }
-
-    public String getTemplateAreaFontFamily() {
-        return templateAreaFontFamily == null ? "" : templateAreaFontFamily;
-    }
-
-    public void setTemplateAreaFontFamily(String templateAreaFontFamily) {
-        this.templateAreaFontFamily = templateAreaFontFamily;
-    }
-
-    public String getTemplateAreaFontColor() {
-        return templateAreaFontColor == null ? "" : templateAreaFontColor;
-    }
-
-    public void setTemplateAreaFontColor(String templateAreaFontColor) {
-        this.templateAreaFontColor = templateAreaFontColor;
-    }
-
-    public String getTemplateAreaFontValue() {
-        return templateAreaFontValue == null ? "" : templateAreaFontValue;
-    }
-
-    public void setTemplateAreaFontValue(String templateAreaFontValue) {
-        this.templateAreaFontValue = templateAreaFontValue;
-    }
-
-    public String getTemplateAreaServerLink() {
-        return templateAreaServerLink == null ? "" : templateAreaServerLink;
-    }
-
-    public void setTemplateAreaServerLink(String templateAreaServerLink) {
-        this.templateAreaServerLink = templateAreaServerLink;
-    }
-
-    public String getTemplateAreaFile() {
-        return templateAreaFile == null ? "" : templateAreaFile;
-    }
-
-    public void setTemplateAreaFile(String templateAreaFile) {
-        this.templateAreaFile = templateAreaFile;
-    }
-
-
-    public String getPicturesTemplateId() {
-        return picturesTemplateId == null ? "" : picturesTemplateId.trim();
-    }
-
-    public void setPicturesTemplateId(String picturesTemplateId) {
-        this.picturesTemplateId = picturesTemplateId;
-    }
-
-    public String getTemplateAreaSource() {
-        return templateAreaSource == null ? "" : templateAreaSource.trim();
-    }
-
-    public void setTemplateAreaSource(String templateAreaSource) {
-        this.templateAreaSource = templateAreaSource;
-    }
-
-    public Double getTemplateAreaLeft() {
-        return templateAreaLeft;
-    }
-
-    public void setTemplateAreaLeft(Double templateAreaLeft) {
-        this.templateAreaLeft = templateAreaLeft;
-    }
-
-    public Double getTemplateAreaTop() {
-        return templateAreaTop;
-    }
-
-    public void setTemplateAreaTop(Double templateAreaTop) {
-        this.templateAreaTop = templateAreaTop;
-    }
-
-    public Double getTemplateAreaDown() {
-        return templateAreaDown;
-    }
-
-    public void setTemplateAreaDown(Double templateAreaDown) {
-        this.templateAreaDown = templateAreaDown;
-    }
-
-    public Double getTemplateAreaRight() {
-        return templateAreaRight;
-    }
-
-    public void setTemplateAreaRight(Double templateAreaRight) {
-        this.templateAreaRight = templateAreaRight;
-    }
-
-    public Double getTemplateAreaHeight() {
-        return templateAreaHeight;
-    }
-
-    public void setTemplateAreaHeight(Double templateAreaHeight) {
-        this.templateAreaHeight = templateAreaHeight;
-    }
-
-    public Double getTemplateAreaWidth() {
-        return templateAreaWidth;
-    }
-
-    public void setTemplateAreaWidth(Double templateAreaWidth) {
-        this.templateAreaWidth = templateAreaWidth;
-    }
-
-    public String getTemplateAreaColor() {
-        return templateAreaColor == null ? "" : templateAreaColor.trim();
-    }
-
-    public void setTemplateAreaColor(String templateAreaColor) {
-        this.templateAreaColor = templateAreaColor;
-    }
-
-    public String getTemplateAreaRemark() {
-        return templateAreaRemark == null ? "" : templateAreaRemark.trim();
-    }
-
-    public void setTemplateAreaRemark(String templateAreaRemark) {
-        this.templateAreaRemark = templateAreaRemark;
-    }
-
-    public String getTemplateAreaStatus() {
-        return templateAreaStatus == null ? "" : templateAreaStatus.trim();
-    }
-
-    public void setTemplateAreaStatus(String templateAreaStatus) {
-        this.templateAreaStatus = templateAreaStatus;
-    }
-
-
-}

pojo-building-pictures/src/main/java/cn/com/tenlion/pojo/vos/picturestemplatebuilding/PicturesTemplateBuildingVO.java

@@ -1,24 +0,0 @@
-<<<<<<< HEAD:pojo-building-pictures/src/main/java/cn/com/tenlion/pojo/vos/picturestemplatebuilding/PicturesTemplateBuildingVO.java
-package cn.com.tenlion.pojo.vos.picturestemplatebuilding;
-=======
-package cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatebuilding;
->>>>>>> 5d0d076509efae042da29b94995d574fe34f3ba6:pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/vos/picturestemplatebuilding/PicturesTemplateBuildingVO.java
-
-import ink.wgink.annotation.CheckEmptyAnnotation;
-import ink.wgink.annotation.CheckNumberAnnotation;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- *
- * @ClassName: PicturesTemplateVO
- * @Description: 图片套版的套版生成管理
- * @Author: WenG
- * @Date: 2020-10-20 10:49
- * @Version: 1.0
- **/
-@ApiModel
-public class PicturesTemplateBuildingVO {
-
-
-}

pojo-material-store/src/main/java/cn/com/tenlion/materialstore/pojo/bos/materialaudio/MaterialAudioBO.java

@@ -1,4 +1,4 @@
-package cn.com.tenlion.pojo.bos.materialaudio;
+package cn.com.tenlion.materialstore.pojo.bos.materialaudio;
 
 /**
  *

pojo-material-store/src/main/java/cn/com/tenlion/materialstore/pojo/bos/materiallink/MaterialLinkBO.java

@@ -1,4 +1,4 @@
-package cn.com.tenlion.pojo.bos.materiallink;
+package cn.com.tenlion.materialstore.pojo.bos.materiallink;
 
 /**
  *

pojo-material-store/src/main/java/cn/com/tenlion/materialstore/pojo/bos/materialmap/MaterialMapBO.java

@@ -1,4 +1,4 @@
-package cn.com.tenlion.pojo.bos.materialmap;
+package cn.com.tenlion.materialstore.pojo.bos.materialmap;
 
 /**
  *

pojo-material-store/src/main/java/cn/com/tenlion/materialstore/pojo/bos/materialphoto/MaterialPhotoBO.java

@@ -1,4 +1,4 @@
-package cn.com.tenlion.pojo.bos.materialphoto;
+package cn.com.tenlion.materialstore.pojo.bos.materialphoto;
 
 /**
  *

pojo-material-store/src/main/java/cn/com/tenlion/materialstore/pojo/bos/materialtext/MaterialTextBO.java

@@ -1,4 +1,4 @@
-package cn.com.tenlion.pojo.bos.materialtext;
+package cn.com.tenlion.materialstore.pojo.bos.materialtext;
 
 /**
  *

pojo-material-store/src/main/java/cn/com/tenlion/materialstore/pojo/bos/materialvideo/MaterialVideoBO.java

@@ -1,4 +1,4 @@
-package cn.com.tenlion.pojo.bos.materialvideo;
+package cn.com.tenlion.materialstore.pojo.bos.materialvideo;
 
 /**
  *

pojo-material-store/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/materialaudio/MaterialAudioDTO.java

@@ -1,4 +1,4 @@
-package cn.com.tenlion.pojo.dtos.materialaudio;
+package cn.com.tenlion.materialstore.pojo.dtos.materialaudio;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

pojo-material-store/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/materialdata/MaterialDataDTO.java

@@ -1,11 +1,11 @@
-package cn.com.tenlion.pojo.dtos.materialdata;
+package cn.com.tenlion.materialstore.pojo.dtos.materialdata;
 
-import cn.com.tenlion.pojo.dtos.materialaudio.MaterialAudioDTO;
+import cn.com.tenlion.materialstore.pojo.dtos.materialaudio.MaterialAudioDTO;
-import cn.com.tenlion.pojo.dtos.materiallink.MaterialLinkDTO;
+import cn.com.tenlion.materialstore.pojo.dtos.materialphoto.MaterialPhotoDTO;
-import cn.com.tenlion.pojo.dtos.materialmap.MaterialMapDTO;
+import cn.com.tenlion.materialstore.pojo.dtos.materialvideo.MaterialVideoDTO;
-import cn.com.tenlion.pojo.dtos.materialphoto.MaterialPhotoDTO;
+import cn.com.tenlion.materialstore.pojo.dtos.materiallink.MaterialLinkDTO;
-import cn.com.tenlion.pojo.dtos.materialtext.MaterialTextDTO;
+import cn.com.tenlion.materialstore.pojo.dtos.materialmap.MaterialMapDTO;
-import cn.com.tenlion.pojo.dtos.materialvideo.MaterialVideoDTO;
+import cn.com.tenlion.materialstore.pojo.dtos.materialtext.MaterialTextDTO;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;

pojo-material-store/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/materiallink/MaterialLinkDTO.java

@@ -1,4 +1,4 @@
-package cn.com.tenlion.pojo.dtos.materiallink;
+package cn.com.tenlion.materialstore.pojo.dtos.materiallink;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

pojo-material-store/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/materialmap/MaterialMapDTO.java

@@ -1,4 +1,4 @@
-package cn.com.tenlion.pojo.dtos.materialmap;
+package cn.com.tenlion.materialstore.pojo.dtos.materialmap;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

pojo-material-store/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/materialphoto/MaterialPhotoDTO.java

@@ -1,4 +1,4 @@
-package cn.com.tenlion.pojo.dtos.materialphoto;
+package cn.com.tenlion.materialstore.pojo.dtos.materialphoto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

pojo-material-store/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/materialtext/MaterialTextDTO.java

@@ -1,4 +1,4 @@
-package cn.com.tenlion.pojo.dtos.materialtext;
+package cn.com.tenlion.materialstore.pojo.dtos.materialtext;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

pojo-material-store/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/materialvideo/MaterialVideoDTO.java

@@ -1,4 +1,4 @@
-package cn.com.tenlion.pojo.dtos.materialvideo;
+package cn.com.tenlion.materialstore.pojo.dtos.materialvideo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

pojo-material-store/src/main/java/cn/com/tenlion/materialstore/pojo/pos/materialaudio/MaterialAudioPO.java

@@ -1,4 +1,4 @@
-package cn.com.tenlion.pojo.pos.materialaudio;
+package cn.com.tenlion.materialstore.pojo.pos.materialaudio;
 
 /**
  *

pojo-material-store/src/main/java/cn/com/tenlion/materialstore/pojo/pos/materiallink/MaterialLinkPO.java

@@ -1,4 +1,4 @@
-package cn.com.tenlion.pojo.pos.materiallink;
+package cn.com.tenlion.materialstore.pojo.pos.materiallink;
 
 /**
  *

pojo-material-store/src/main/java/cn/com/tenlion/materialstore/pojo/pos/materialmap/MaterialMapPO.java

@@ -1,4 +1,4 @@
-package cn.com.tenlion.pojo.pos.materialmap;
+package cn.com.tenlion.materialstore.pojo.pos.materialmap;
 
 /**
  *

pojo-material-store/src/main/java/cn/com/tenlion/materialstore/pojo/pos/materialphoto/MaterialPhotoPO.java

@@ -1,4 +1,4 @@
-package cn.com.tenlion.pojo.pos.materialphoto;
+package cn.com.tenlion.materialstore.pojo.pos.materialphoto;
 
 /**
  *

pojo-material-store/src/main/java/cn/com/tenlion/materialstore/pojo/pos/materialtext/MaterialTextPO.java

@@ -1,4 +1,4 @@
-package cn.com.tenlion.pojo.pos.materialtext;
+package cn.com.tenlion.materialstore.pojo.pos.materialtext;
 
 /**
  *

pojo-material-store/src/main/java/cn/com/tenlion/materialstore/pojo/pos/materialvideo/MaterialVideoPO.java

@@ -1,4 +1,4 @@
-package cn.com.tenlion.pojo.pos.materialvideo;
+package cn.com.tenlion.materialstore.pojo.pos.materialvideo;
 
 /**
  *

pojo-material-store/src/main/java/cn/com/tenlion/materialstore/pojo/vos/materialaudio/MaterialAudioVO.java

@@ -1,4 +1,4 @@
-package cn.com.tenlion.pojo.vos.materialaudio;
+package cn.com.tenlion.materialstore.pojo.vos.materialaudio;
 
 import ink.wgink.annotation.CheckNumberAnnotation;
 import io.swagger.annotations.ApiModel;

pojo-material-store/src/main/java/cn/com/tenlion/materialstore/pojo/vos/materialdata/MaterialDataVO.java

@@ -1,22 +1,11 @@
-<<<<<<< HEAD:pojo-material-store/src/main/java/cn/com/tenlion/pojo/vos/materialdata/MaterialDataVO.java
-package cn.com.tenlion.pojo.vos.materialdata;
-
-import cn.com.tenlion.pojo.vos.materialaudio.MaterialAudioVO;
-import cn.com.tenlion.pojo.vos.materiallink.MaterialLinkVO;
-import cn.com.tenlion.pojo.vos.materialmap.MaterialMapVO;
-import cn.com.tenlion.pojo.vos.materialphoto.MaterialPhotoVO;
-import cn.com.tenlion.pojo.vos.materialtext.MaterialTextVO;
-import cn.com.tenlion.pojo.vos.materialvideo.MaterialVideoVO;
-=======
 package cn.com.tenlion.materialstore.pojo.vos.materialdata;
 
-import cn.com.tenlion.materialstore.pojo.vos.materialmap.MaterialMapVO;
 import cn.com.tenlion.materialstore.pojo.vos.materialaudio.MaterialAudioVO;
 import cn.com.tenlion.materialstore.pojo.vos.materiallink.MaterialLinkVO;
+import cn.com.tenlion.materialstore.pojo.vos.materialmap.MaterialMapVO;
 import cn.com.tenlion.materialstore.pojo.vos.materialphoto.MaterialPhotoVO;
 import cn.com.tenlion.materialstore.pojo.vos.materialtext.MaterialTextVO;
 import cn.com.tenlion.materialstore.pojo.vos.materialvideo.MaterialVideoVO;
->>>>>>> 5d0d076509efae042da29b94995d574fe34f3ba6:pojo-material-store/src/main/java/cn/com/tenlion/materialstore/pojo/vos/materialdata/MaterialDataVO.java
 import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;

pojo-material-store/src/main/java/cn/com/tenlion/materialstore/pojo/vos/materiallink/MaterialLinkVO.java

@@ -1,4 +1,4 @@
-package cn.com.tenlion.pojo.vos.materiallink;
+package cn.com.tenlion.materialstore.pojo.vos.materiallink;
 
 import ink.wgink.annotation.CheckEmptyAnnotation;
 import ink.wgink.annotation.CheckNumberAnnotation;

pojo-material-store/src/main/java/cn/com/tenlion/materialstore/pojo/vos/materialmap/MaterialMapVO.java

@@ -1,4 +1,4 @@
-package cn.com.tenlion.pojo.vos.materialmap;
+package cn.com.tenlion.materialstore.pojo.vos.materialmap;
 
 import ink.wgink.annotation.CheckEmptyAnnotation;
 import ink.wgink.annotation.CheckNumberAnnotation;

pojo-material-store/src/main/java/cn/com/tenlion/materialstore/pojo/vos/materialphoto/MaterialPhotoVO.java

@@ -1,4 +1,4 @@
-package cn.com.tenlion.pojo.vos.materialphoto;
+package cn.com.tenlion.materialstore.pojo.vos.materialphoto;
 
 import ink.wgink.annotation.CheckEmptyAnnotation;
 import ink.wgink.annotation.CheckNumberAnnotation;

pojo-material-store/src/main/java/cn/com/tenlion/materialstore/pojo/vos/materialtext/MaterialTextVO.java

@@ -1,4 +1,4 @@
-package cn.com.tenlion.pojo.vos.materialtext;
+package cn.com.tenlion.materialstore.pojo.vos.materialtext;
 
 import ink.wgink.annotation.CheckEmptyAnnotation;
 import ink.wgink.annotation.CheckNumberAnnotation;

pojo-material-store/src/main/java/cn/com/tenlion/materialstore/pojo/vos/materialvideo/MaterialVideoVO.java

@@ -1,4 +1,4 @@
-package cn.com.tenlion.pojo.vos.materialvideo;
+package cn.com.tenlion.materialstore.pojo.vos.materialvideo;
 
 import ink.wgink.annotation.CheckEmptyAnnotation;
 import ink.wgink.annotation.CheckNumberAnnotation;