添加皮肤管理

base-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java

@@ -85,7 +85,7 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
             }
             userEntity = userService.doLogin(loginName, password, ip);
             userEntity.setLastLoginAddress(ip);
-            saveCurrUser(userEntity);
+
 
             recordSysLog(request, userEntity, "用户登录系统成功!");
             // 返回拥有的菜单数据

base-manager/src/main/java/com/mortals/xhx/common/code/DeviceTypeEnum.java

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 设备类型  (pdj.排队机，ckp.窗口屏，hjq.呼叫器，jzxsp.集中显示屏，dsj.导视机，pjq.评级器，zzfwzd.自助服务终端，tdj.填单机，ybj.样表机)枚举类
+*
+* @author zxfei
+*/
+public enum DeviceTypeEnum {
+    排队机("pdj", "排队机"),
+    窗口屏("ckp", "窗口屏"),
+    呼叫器("hjq", "呼叫器"),
+    集中显示屏("jzxsp", "集中显示屏"),
+    导视机("dsj", "导视机"),
+    评级器("pjq", "评级器"),
+    自助服务终端("zzfwzd", "自助服务终端"),
+    填单机("tdj", "填单机"),
+    样表机("ybj", "样表机");
+    private String value;
+    private String desc;
+
+    DeviceTypeEnum(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static DeviceTypeEnum getByValue(String value) {
+        for (DeviceTypeEnum deviceTypeEnum : DeviceTypeEnum.values()) {
+            if (deviceTypeEnum.getValue() == value) {
+                return deviceTypeEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(String... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (DeviceTypeEnum item : DeviceTypeEnum.values()) {
+            try {
+                boolean hasE = false;
+                for (String e : eItem) {
+                    if (item.getValue() == e) {
+                        hasE = true;
+                        break;
+                    }
+                }
+                if (!hasE) {
+                    resultMap.put(item.getValue() + "", item.getDesc());
+                }
+            } catch (Exception ex) {
+
+            }
+        }
+        return resultMap;
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/common/code/ImageResolutionEnum.java

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 分辨率 (1.1920*1080，2.1080*1920，3.1280*1280)枚举类
+*
+* @author zxfei
+*/
+public enum ImageResolutionEnum {
+    R1920_1080("1", "1920*1080"),
+    R1080_1920("2", "1080*1920"),
+    R1280_1280("3", "1280*1280");
+    private String value;
+    private String desc;
+
+    ImageResolutionEnum(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static ImageResolutionEnum getByValue(String value) {
+        for (ImageResolutionEnum imageResolutionEnum : ImageResolutionEnum.values()) {
+            if (imageResolutionEnum.getValue() == value) {
+                return imageResolutionEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(String... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (ImageResolutionEnum item : ImageResolutionEnum.values()) {
+            try {
+                boolean hasE = false;
+                for (String e : eItem) {
+                    if (item.getValue() == e) {
+                        hasE = true;
+                        break;
+                    }
+                }
+                if (!hasE) {
+                    resultMap.put(item.getValue() + "", item.getDesc());
+                }
+            } catch (Exception ex) {
+
+            }
+        }
+        return resultMap;
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteBusinessController.java

@@ -7,16 +7,13 @@ import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
 import com.mortals.framework.util.StringUtils;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.IsBusinessEnum;
-import com.mortals.xhx.module.business.model.BusinessEntity;
 import com.mortals.xhx.module.site.model.SiteBusinessEntity;
 import com.mortals.xhx.module.site.model.SiteBusinessQuery;
 import com.mortals.xhx.module.site.model.SiteBusinessTreeSelect;
 import com.mortals.xhx.module.site.service.SiteBusinessService;
 import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -28,8 +25,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static com.mortals.framework.ap.SysConstains.RESULT_KEY;
-
 /**
  * 站点事项
  *

base-manager/src/main/java/com/mortals/xhx/module/skin/dao/SkinBaseDao.java

+package com.mortals.xhx.module.skin.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.skin.model.SkinBaseEntity;
+import java.util.List;
+/**
+* 系统基础皮肤Dao
+* 系统基础皮肤 DAO接口
+*
+* @author zxfei
+* @date 2022-05-16
+*/
+public interface  SkinBaseDao extends ICRUDDao<SkinBaseEntity,Long>{
+
+
+}

base-manager/src/main/java/com/mortals/xhx/module/skin/dao/SkinCategoryDao.java

+package com.mortals.xhx.module.skin.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.skin.model.SkinCategoryEntity;
+import java.util.List;
+/**
+* 系统皮肤分类Dao
+* 系统皮肤分类 DAO接口
+*
+* @author zxfei
+* @date 2022-05-16
+*/
+public interface  SkinCategoryDao extends ICRUDDao<SkinCategoryEntity,Long>{
+
+
+}

base-manager/src/main/java/com/mortals/xhx/module/skin/dao/ibatis/SkinBaseDaoImpl.java

+package com.mortals.xhx.module.skin.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.skin.dao.SkinBaseDao;
+import com.mortals.xhx.module.skin.model.SkinBaseEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 系统基础皮肤DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2022-05-16
+*/
+@Repository("skinBaseDao")
+public class SkinBaseDaoImpl extends BaseCRUDDaoMybatis<SkinBaseEntity,Long> implements SkinBaseDao {
+
+
+
+}

base-manager/src/main/java/com/mortals/xhx/module/skin/dao/ibatis/SkinCategoryDaoImpl.java

+package com.mortals.xhx.module.skin.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.skin.dao.SkinCategoryDao;
+import com.mortals.xhx.module.skin.model.SkinCategoryEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 系统皮肤分类DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2022-05-16
+*/
+@Repository("skinCategoryDao")
+public class SkinCategoryDaoImpl extends BaseCRUDDaoMybatis<SkinCategoryEntity,Long> implements SkinCategoryDao {
+
+
+
+}

base-manager/src/main/java/com/mortals/xhx/module/skin/model/SkinBaseEntity.java

+package com.mortals.xhx.module.skin.model;
+
+import java.util.List;
+import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.skin.model.vo.SkinBaseVo;
+/**
+* 系统基础皮肤实体对象
+*
+* @author zxfei
+* @date 2022-05-16
+*/
+
+public class SkinBaseEntity extends SkinBaseVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 所属种类,来源种类
+    */
+    private Long categoryId;
+    /**
+    * 设备类型  (pdj.排队机，ckp.窗口屏，hjq.呼叫器，jzxsp.集中显示屏，dsj.导视机，pjq.评级器，zzfwzd.自助服务终端，tdj.填单机，ybj.样表机)
+    */
+    private String deviceType;
+    /**
+    * 皮肤名称
+    */
+    private String shortName;
+    /**
+    * 分辨率 (1.1920*1080，2.1080*1920，3.1280*1280)
+    */
+    private String imageResolution;
+    /**
+    * 背景大图
+    */
+    private String backgroundImagePath;
+    /**
+    * 现场取号图片
+    */
+    private String sceneNumImagePath;
+    /**
+    * 预约取号图片
+    */
+    private String bookingNumImagePath;
+    /**
+    * vip取号图片
+    */
+    private String vipNumImagePath;
+    /**
+    * 重打小票图片
+    */
+    private String smallTicketNumImagePath;
+    /**
+    * 现场签到图片
+    */
+    private String sceneSignImagePath;
+    /**
+    * 政务网取号图片
+    */
+    private String govNumImagePath;
+    /**
+    * 标题颜色
+    */
+    private String titleColorStyle;
+    /**
+    * 时间颜色
+    */
+    private String timeColorStyle;
+    /**
+    * 数据标题颜色
+    */
+    private String dataTitleColorStyle;
+    /**
+    * 数据颜色
+    */
+    private String dataColorStyle;
+    /**
+    * 备案颜色
+    */
+    private String recordColorStyle;
+    /**
+    * 预览图片
+    */
+    private String previewImagePath;
+    /**
+    * 排序编号
+    */
+    private Integer sortNum;
+
+
+
+    public SkinBaseEntity(){}
+    /**
+    * 获取 所属种类,来源种类
+    * @return Long
+    */
+    public Long getCategoryId(){
+        return categoryId;
+    }
+    /**
+    * 设置 所属种类,来源种类
+    * @param categoryId
+    */
+    public void setCategoryId(Long categoryId){
+        this.categoryId = categoryId;
+    }
+    /**
+    * 获取 设备类型  (pdj.排队机，ckp.窗口屏，hjq.呼叫器，jzxsp.集中显示屏，dsj.导视机，pjq.评级器，zzfwzd.自助服务终端，tdj.填单机，ybj.样表机)
+    * @return String
+    */
+    public String getDeviceType(){
+        return deviceType;
+    }
+    /**
+    * 设置 设备类型  (pdj.排队机，ckp.窗口屏，hjq.呼叫器，jzxsp.集中显示屏，dsj.导视机，pjq.评级器，zzfwzd.自助服务终端，tdj.填单机，ybj.样表机)
+    * @param deviceType
+    */
+    public void setDeviceType(String deviceType){
+        this.deviceType = deviceType;
+    }
+    /**
+    * 获取 皮肤名称
+    * @return String
+    */
+    public String getShortName(){
+        return shortName;
+    }
+    /**
+    * 设置 皮肤名称
+    * @param shortName
+    */
+    public void setShortName(String shortName){
+        this.shortName = shortName;
+    }
+    /**
+    * 获取 分辨率 (1.1920*1080，2.1080*1920，3.1280*1280)
+    * @return String
+    */
+    public String getImageResolution(){
+        return imageResolution;
+    }
+    /**
+    * 设置 分辨率 (1.1920*1080，2.1080*1920，3.1280*1280)
+    * @param imageResolution
+    */
+    public void setImageResolution(String imageResolution){
+        this.imageResolution = imageResolution;
+    }
+    /**
+    * 获取 背景大图
+    * @return String
+    */
+    public String getBackgroundImagePath(){
+        return backgroundImagePath;
+    }
+    /**
+    * 设置 背景大图
+    * @param backgroundImagePath
+    */
+    public void setBackgroundImagePath(String backgroundImagePath){
+        this.backgroundImagePath = backgroundImagePath;
+    }
+    /**
+    * 获取 现场取号图片
+    * @return String
+    */
+    public String getSceneNumImagePath(){
+        return sceneNumImagePath;
+    }
+    /**
+    * 设置 现场取号图片
+    * @param sceneNumImagePath
+    */
+    public void setSceneNumImagePath(String sceneNumImagePath){
+        this.sceneNumImagePath = sceneNumImagePath;
+    }
+    /**
+    * 获取 预约取号图片
+    * @return String
+    */
+    public String getBookingNumImagePath(){
+        return bookingNumImagePath;
+    }
+    /**
+    * 设置 预约取号图片
+    * @param bookingNumImagePath
+    */
+    public void setBookingNumImagePath(String bookingNumImagePath){
+        this.bookingNumImagePath = bookingNumImagePath;
+    }
+    /**
+    * 获取 vip取号图片
+    * @return String
+    */
+    public String getVipNumImagePath(){
+        return vipNumImagePath;
+    }
+    /**
+    * 设置 vip取号图片
+    * @param vipNumImagePath
+    */
+    public void setVipNumImagePath(String vipNumImagePath){
+        this.vipNumImagePath = vipNumImagePath;
+    }
+    /**
+    * 获取 重打小票图片
+    * @return String
+    */
+    public String getSmallTicketNumImagePath(){
+        return smallTicketNumImagePath;
+    }
+    /**
+    * 设置 重打小票图片
+    * @param smallTicketNumImagePath
+    */
+    public void setSmallTicketNumImagePath(String smallTicketNumImagePath){
+        this.smallTicketNumImagePath = smallTicketNumImagePath;
+    }
+    /**
+    * 获取 现场签到图片
+    * @return String
+    */
+    public String getSceneSignImagePath(){
+        return sceneSignImagePath;
+    }
+    /**
+    * 设置 现场签到图片
+    * @param sceneSignImagePath
+    */
+    public void setSceneSignImagePath(String sceneSignImagePath){
+        this.sceneSignImagePath = sceneSignImagePath;
+    }
+    /**
+    * 获取 政务网取号图片
+    * @return String
+    */
+    public String getGovNumImagePath(){
+        return govNumImagePath;
+    }
+    /**
+    * 设置 政务网取号图片
+    * @param govNumImagePath
+    */
+    public void setGovNumImagePath(String govNumImagePath){
+        this.govNumImagePath = govNumImagePath;
+    }
+    /**
+    * 获取 标题颜色
+    * @return String
+    */
+    public String getTitleColorStyle(){
+        return titleColorStyle;
+    }
+    /**
+    * 设置 标题颜色
+    * @param titleColorStyle
+    */
+    public void setTitleColorStyle(String titleColorStyle){
+        this.titleColorStyle = titleColorStyle;
+    }
+    /**
+    * 获取 时间颜色
+    * @return String
+    */
+    public String getTimeColorStyle(){
+        return timeColorStyle;
+    }
+    /**
+    * 设置 时间颜色
+    * @param timeColorStyle
+    */
+    public void setTimeColorStyle(String timeColorStyle){
+        this.timeColorStyle = timeColorStyle;
+    }
+    /**
+    * 获取 数据标题颜色
+    * @return String
+    */
+    public String getDataTitleColorStyle(){
+        return dataTitleColorStyle;
+    }
+    /**
+    * 设置 数据标题颜色
+    * @param dataTitleColorStyle
+    */
+    public void setDataTitleColorStyle(String dataTitleColorStyle){
+        this.dataTitleColorStyle = dataTitleColorStyle;
+    }
+    /**
+    * 获取 数据颜色
+    * @return String
+    */
+    public String getDataColorStyle(){
+        return dataColorStyle;
+    }
+    /**
+    * 设置 数据颜色
+    * @param dataColorStyle
+    */
+    public void setDataColorStyle(String dataColorStyle){
+        this.dataColorStyle = dataColorStyle;
+    }
+    /**
+    * 获取 备案颜色
+    * @return String
+    */
+    public String getRecordColorStyle(){
+        return recordColorStyle;
+    }
+    /**
+    * 设置 备案颜色
+    * @param recordColorStyle
+    */
+    public void setRecordColorStyle(String recordColorStyle){
+        this.recordColorStyle = recordColorStyle;
+    }
+    /**
+    * 获取 预览图片
+    * @return String
+    */
+    public String getPreviewImagePath(){
+        return previewImagePath;
+    }
+    /**
+    * 设置 预览图片
+    * @param previewImagePath
+    */
+    public void setPreviewImagePath(String previewImagePath){
+        this.previewImagePath = previewImagePath;
+    }
+    /**
+    * 获取 排序编号
+    * @return Integer
+    */
+    public Integer getSortNum(){
+        return sortNum;
+    }
+    /**
+    * 设置 排序编号
+    * @param sortNum
+    */
+    public void setSortNum(Integer sortNum){
+        this.sortNum = sortNum;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof SkinBaseEntity) {
+            SkinBaseEntity tmp = (SkinBaseEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",categoryId:").append(getCategoryId());
+        sb.append(",deviceType:").append(getDeviceType());
+        sb.append(",shortName:").append(getShortName());
+        sb.append(",imageResolution:").append(getImageResolution());
+        sb.append(",backgroundImagePath:").append(getBackgroundImagePath());
+        sb.append(",sceneNumImagePath:").append(getSceneNumImagePath());
+        sb.append(",bookingNumImagePath:").append(getBookingNumImagePath());
+        sb.append(",vipNumImagePath:").append(getVipNumImagePath());
+        sb.append(",smallTicketNumImagePath:").append(getSmallTicketNumImagePath());
+        sb.append(",sceneSignImagePath:").append(getSceneSignImagePath());
+        sb.append(",govNumImagePath:").append(getGovNumImagePath());
+        sb.append(",titleColorStyle:").append(getTitleColorStyle());
+        sb.append(",timeColorStyle:").append(getTimeColorStyle());
+        sb.append(",dataTitleColorStyle:").append(getDataTitleColorStyle());
+        sb.append(",dataColorStyle:").append(getDataColorStyle());
+        sb.append(",recordColorStyle:").append(getRecordColorStyle());
+        sb.append(",previewImagePath:").append(getPreviewImagePath());
+        sb.append(",sortNum:").append(getSortNum());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.categoryId = null;
+
+            this.deviceType = "phj";
+
+            this.shortName = "";
+
+            this.imageResolution = "0";
+
+            this.backgroundImagePath = "";
+
+            this.sceneNumImagePath = "";
+
+            this.bookingNumImagePath = "";
+
+            this.vipNumImagePath = "";
+
+            this.smallTicketNumImagePath = "";
+
+            this.sceneSignImagePath = "";
+
+            this.govNumImagePath = "";
+
+            this.titleColorStyle = "";
+
+            this.timeColorStyle = "";
+
+            this.dataTitleColorStyle = "";
+
+            this.dataColorStyle = "";
+
+            this.recordColorStyle = "";
+
+            this.previewImagePath = "";
+
+            this.sortNum = null;
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/model/SkinBaseQuery.java

+package com.mortals.xhx.module.skin.model;
+
+import java.util.List;
+import com.mortals.xhx.module.skin.model.SkinBaseEntity;
+/**
+* 系统基础皮肤查询对象
+*
+* @author zxfei
+* @date 2022-05-16
+*/
+public class SkinBaseQuery extends SkinBaseEntity {
+    /** 开始 序号，主键，自增长 */
+    private Long idStart;
+
+    /** 结束 序号，主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 序号，主键，自增长 */
+    private Long idIncrement;
+
+    /** 序号，主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 开始 所属种类,来源种类 */
+    private Long categoryIdStart;
+
+    /** 结束 所属种类,来源种类 */
+    private Long categoryIdEnd;
+
+    /** 增加 所属种类,来源种类 */
+    private Long categoryIdIncrement;
+
+    /** 所属种类,来源种类列表 */
+    private List <Long> categoryIdList;
+
+    /** 设备类型  (pdj.排队机，ckp.窗口屏，hjq.呼叫器，jzxsp.集中显示屏，dsj.导视机，pjq.评级器，zzfwzd.自助服务终端，tdj.填单机，ybj.样表机) */
+    private List<String> deviceTypeList;
+
+    /** 皮肤名称 */
+    private List<String> shortNameList;
+
+    /** 分辨率 (1.1920*1080，2.1080*1920，3.1280*1280) */
+    private List<String> imageResolutionList;
+
+    /** 背景大图 */
+    private List<String> backgroundImagePathList;
+
+    /** 现场取号图片 */
+    private List<String> sceneNumImagePathList;
+
+    /** 预约取号图片 */
+    private List<String> bookingNumImagePathList;
+
+    /** vip取号图片 */
+    private List<String> vipNumImagePathList;
+
+    /** 重打小票图片 */
+    private List<String> smallTicketNumImagePathList;
+
+    /** 现场签到图片 */
+    private List<String> sceneSignImagePathList;
+
+    /** 政务网取号图片 */
+    private List<String> govNumImagePathList;
+
+    /** 标题颜色 */
+    private List<String> titleColorStyleList;
+
+    /** 时间颜色 */
+    private List<String> timeColorStyleList;
+
+    /** 数据标题颜色 */
+    private List<String> dataTitleColorStyleList;
+
+    /** 数据颜色 */
+    private List<String> dataColorStyleList;
+
+    /** 备案颜色 */
+    private List<String> recordColorStyleList;
+
+    /** 预览图片 */
+    private List<String> previewImagePathList;
+
+    /** 开始 排序编号 */
+    private Integer sortNumStart;
+
+    /** 结束 排序编号 */
+    private Integer sortNumEnd;
+
+    /** 增加 排序编号 */
+    private Integer sortNumIncrement;
+
+    /** 排序编号列表 */
+    private List <Integer> sortNumList;
+
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 创建用户 */
+    private Long createUserIdStart;
+
+    /** 结束 创建用户 */
+    private Long createUserIdEnd;
+
+    /** 增加 创建用户 */
+    private Long createUserIdIncrement;
+
+    /** 创建用户列表 */
+    private List <Long> createUserIdList;
+
+    /** 开始 修改时间 */
+    private String updateTimeStart;
+
+    /** 结束 修改时间 */
+    private String updateTimeEnd;
+
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<SkinBaseQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<SkinBaseQuery> andConditionList;
+
+    public SkinBaseQuery(){}
+
+    /**
+    * 获取 开始 序号，主键，自增长
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 序号，主键，自增长
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 序号，主键，自增长
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 序号，主键，自增长
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 序号，主键，自增长
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 序号，主键，自增长
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 序号，主键，自增长
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 开始 所属种类,来源种类
+    * @return categoryIdStart
+    */
+    public Long getCategoryIdStart(){
+        return this.categoryIdStart;
+    }
+
+    /**
+    * 设置 开始 所属种类,来源种类
+    * @param categoryIdStart
+    */
+    public void setCategoryIdStart(Long categoryIdStart){
+        this.categoryIdStart = categoryIdStart;
+    }
+
+    /**
+    * 获取 结束 所属种类,来源种类
+    * @return $categoryIdEnd
+    */
+    public Long getCategoryIdEnd(){
+        return this.categoryIdEnd;
+    }
+
+    /**
+    * 设置 结束 所属种类,来源种类
+    * @param categoryIdEnd
+    */
+    public void setCategoryIdEnd(Long categoryIdEnd){
+        this.categoryIdEnd = categoryIdEnd;
+    }
+
+    /**
+    * 获取 增加 所属种类,来源种类
+    * @return categoryIdIncrement
+    */
+    public Long getCategoryIdIncrement(){
+        return this.categoryIdIncrement;
+    }
+
+    /**
+    * 设置 增加 所属种类,来源种类
+    * @param categoryIdIncrement
+    */
+    public void setCategoryIdIncrement(Long categoryIdIncrement){
+        this.categoryIdIncrement = categoryIdIncrement;
+    }
+
+    /**
+    * 获取 所属种类,来源种类
+    * @return categoryIdList
+    */
+    public List<Long> getCategoryIdList(){
+        return this.categoryIdList;
+    }
+
+    /**
+    * 设置 所属种类,来源种类
+    * @param categoryIdList
+    */
+    public void setCategoryIdList(List<Long> categoryIdList){
+        this.categoryIdList = categoryIdList;
+    }
+
+    /**
+    * 获取 设备类型  (pdj.排队机，ckp.窗口屏，hjq.呼叫器，jzxsp.集中显示屏，dsj.导视机，pjq.评级器，zzfwzd.自助服务终端，tdj.填单机，ybj.样表机)
+    * @return deviceTypeList
+    */
+    public List<String> getDeviceTypeList(){
+        return this.deviceTypeList;
+    }
+
+    /**
+    * 设置 设备类型  (pdj.排队机，ckp.窗口屏，hjq.呼叫器，jzxsp.集中显示屏，dsj.导视机，pjq.评级器，zzfwzd.自助服务终端，tdj.填单机，ybj.样表机)
+    * @param deviceTypeList
+    */
+    public void setDeviceTypeList(List<String> deviceTypeList){
+        this.deviceTypeList = deviceTypeList;
+    }
+    /**
+    * 获取 皮肤名称
+    * @return shortNameList
+    */
+    public List<String> getShortNameList(){
+        return this.shortNameList;
+    }
+
+    /**
+    * 设置 皮肤名称
+    * @param shortNameList
+    */
+    public void setShortNameList(List<String> shortNameList){
+        this.shortNameList = shortNameList;
+    }
+    /**
+    * 获取 分辨率 (1.1920*1080，2.1080*1920，3.1280*1280)
+    * @return imageResolutionList
+    */
+    public List<String> getImageResolutionList(){
+        return this.imageResolutionList;
+    }
+
+    /**
+    * 设置 分辨率 (1.1920*1080，2.1080*1920，3.1280*1280)
+    * @param imageResolutionList
+    */
+    public void setImageResolutionList(List<String> imageResolutionList){
+        this.imageResolutionList = imageResolutionList;
+    }
+    /**
+    * 获取 背景大图
+    * @return backgroundImagePathList
+    */
+    public List<String> getBackgroundImagePathList(){
+        return this.backgroundImagePathList;
+    }
+
+    /**
+    * 设置 背景大图
+    * @param backgroundImagePathList
+    */
+    public void setBackgroundImagePathList(List<String> backgroundImagePathList){
+        this.backgroundImagePathList = backgroundImagePathList;
+    }
+    /**
+    * 获取 现场取号图片
+    * @return sceneNumImagePathList
+    */
+    public List<String> getSceneNumImagePathList(){
+        return this.sceneNumImagePathList;
+    }
+
+    /**
+    * 设置 现场取号图片
+    * @param sceneNumImagePathList
+    */
+    public void setSceneNumImagePathList(List<String> sceneNumImagePathList){
+        this.sceneNumImagePathList = sceneNumImagePathList;
+    }
+    /**
+    * 获取 预约取号图片
+    * @return bookingNumImagePathList
+    */
+    public List<String> getBookingNumImagePathList(){
+        return this.bookingNumImagePathList;
+    }
+
+    /**
+    * 设置 预约取号图片
+    * @param bookingNumImagePathList
+    */
+    public void setBookingNumImagePathList(List<String> bookingNumImagePathList){
+        this.bookingNumImagePathList = bookingNumImagePathList;
+    }
+    /**
+    * 获取 vip取号图片
+    * @return vipNumImagePathList
+    */
+    public List<String> getVipNumImagePathList(){
+        return this.vipNumImagePathList;
+    }
+
+    /**
+    * 设置 vip取号图片
+    * @param vipNumImagePathList
+    */
+    public void setVipNumImagePathList(List<String> vipNumImagePathList){
+        this.vipNumImagePathList = vipNumImagePathList;
+    }
+    /**
+    * 获取 重打小票图片
+    * @return smallTicketNumImagePathList
+    */
+    public List<String> getSmallTicketNumImagePathList(){
+        return this.smallTicketNumImagePathList;
+    }
+
+    /**
+    * 设置 重打小票图片
+    * @param smallTicketNumImagePathList
+    */
+    public void setSmallTicketNumImagePathList(List<String> smallTicketNumImagePathList){
+        this.smallTicketNumImagePathList = smallTicketNumImagePathList;
+    }
+    /**
+    * 获取 现场签到图片
+    * @return sceneSignImagePathList
+    */
+    public List<String> getSceneSignImagePathList(){
+        return this.sceneSignImagePathList;
+    }
+
+    /**
+    * 设置 现场签到图片
+    * @param sceneSignImagePathList
+    */
+    public void setSceneSignImagePathList(List<String> sceneSignImagePathList){
+        this.sceneSignImagePathList = sceneSignImagePathList;
+    }
+    /**
+    * 获取 政务网取号图片
+    * @return govNumImagePathList
+    */
+    public List<String> getGovNumImagePathList(){
+        return this.govNumImagePathList;
+    }
+
+    /**
+    * 设置 政务网取号图片
+    * @param govNumImagePathList
+    */
+    public void setGovNumImagePathList(List<String> govNumImagePathList){
+        this.govNumImagePathList = govNumImagePathList;
+    }
+    /**
+    * 获取 标题颜色
+    * @return titleColorStyleList
+    */
+    public List<String> getTitleColorStyleList(){
+        return this.titleColorStyleList;
+    }
+
+    /**
+    * 设置 标题颜色
+    * @param titleColorStyleList
+    */
+    public void setTitleColorStyleList(List<String> titleColorStyleList){
+        this.titleColorStyleList = titleColorStyleList;
+    }
+    /**
+    * 获取 时间颜色
+    * @return timeColorStyleList
+    */
+    public List<String> getTimeColorStyleList(){
+        return this.timeColorStyleList;
+    }
+
+    /**
+    * 设置 时间颜色
+    * @param timeColorStyleList
+    */
+    public void setTimeColorStyleList(List<String> timeColorStyleList){
+        this.timeColorStyleList = timeColorStyleList;
+    }
+    /**
+    * 获取 数据标题颜色
+    * @return dataTitleColorStyleList
+    */
+    public List<String> getDataTitleColorStyleList(){
+        return this.dataTitleColorStyleList;
+    }
+
+    /**
+    * 设置 数据标题颜色
+    * @param dataTitleColorStyleList
+    */
+    public void setDataTitleColorStyleList(List<String> dataTitleColorStyleList){
+        this.dataTitleColorStyleList = dataTitleColorStyleList;
+    }
+    /**
+    * 获取 数据颜色
+    * @return dataColorStyleList
+    */
+    public List<String> getDataColorStyleList(){
+        return this.dataColorStyleList;
+    }
+
+    /**
+    * 设置 数据颜色
+    * @param dataColorStyleList
+    */
+    public void setDataColorStyleList(List<String> dataColorStyleList){
+        this.dataColorStyleList = dataColorStyleList;
+    }
+    /**
+    * 获取 备案颜色
+    * @return recordColorStyleList
+    */
+    public List<String> getRecordColorStyleList(){
+        return this.recordColorStyleList;
+    }
+
+    /**
+    * 设置 备案颜色
+    * @param recordColorStyleList
+    */
+    public void setRecordColorStyleList(List<String> recordColorStyleList){
+        this.recordColorStyleList = recordColorStyleList;
+    }
+    /**
+    * 获取 预览图片
+    * @return previewImagePathList
+    */
+    public List<String> getPreviewImagePathList(){
+        return this.previewImagePathList;
+    }
+
+    /**
+    * 设置 预览图片
+    * @param previewImagePathList
+    */
+    public void setPreviewImagePathList(List<String> previewImagePathList){
+        this.previewImagePathList = previewImagePathList;
+    }
+    /**
+    * 获取 开始 排序编号
+    * @return sortNumStart
+    */
+    public Integer getSortNumStart(){
+        return this.sortNumStart;
+    }
+
+    /**
+    * 设置 开始 排序编号
+    * @param sortNumStart
+    */
+    public void setSortNumStart(Integer sortNumStart){
+        this.sortNumStart = sortNumStart;
+    }
+
+    /**
+    * 获取 结束 排序编号
+    * @return $sortNumEnd
+    */
+    public Integer getSortNumEnd(){
+        return this.sortNumEnd;
+    }
+
+    /**
+    * 设置 结束 排序编号
+    * @param sortNumEnd
+    */
+    public void setSortNumEnd(Integer sortNumEnd){
+        this.sortNumEnd = sortNumEnd;
+    }
+
+    /**
+    * 获取 增加 排序编号
+    * @return sortNumIncrement
+    */
+    public Integer getSortNumIncrement(){
+        return this.sortNumIncrement;
+    }
+
+    /**
+    * 设置 增加 排序编号
+    * @param sortNumIncrement
+    */
+    public void setSortNumIncrement(Integer sortNumIncrement){
+        this.sortNumIncrement = sortNumIncrement;
+    }
+
+    /**
+    * 获取 排序编号
+    * @return sortNumList
+    */
+    public List<Integer> getSortNumList(){
+        return this.sortNumList;
+    }
+
+    /**
+    * 设置 排序编号
+    * @param sortNumList
+    */
+    public void setSortNumList(List<Integer> sortNumList){
+        this.sortNumList = sortNumList;
+    }
+
+    /**
+    * 获取 开始 创建时间
+    * @return createTimeStart
+    */
+    public String getCreateTimeStart(){
+        return this.createTimeStart;
+    }
+
+    /**
+    * 设置 开始 创建时间
+    * @param createTimeStart
+    */
+    public void setCreateTimeStart(String createTimeStart){
+        this.createTimeStart = createTimeStart;
+    }
+
+    /**
+    * 获取 结束 创建时间
+    * @return createTimeEnd
+    */
+    public String getCreateTimeEnd(){
+        return this.createTimeEnd;
+    }
+
+    /**
+    * 设置 结束 创建时间
+    * @param createTimeEnd
+    */
+    public void setCreateTimeEnd(String createTimeEnd){
+        this.createTimeEnd = createTimeEnd;
+    }
+
+    /**
+    * 获取 开始 创建用户
+    * @return createUserIdStart
+    */
+    public Long getCreateUserIdStart(){
+        return this.createUserIdStart;
+    }
+
+    /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public void setCreateUserIdStart(Long createUserIdStart){
+        this.createUserIdStart = createUserIdStart;
+    }
+
+    /**
+    * 获取 结束 创建用户
+    * @return $createUserIdEnd
+    */
+    public Long getCreateUserIdEnd(){
+        return this.createUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public void setCreateUserIdEnd(Long createUserIdEnd){
+        this.createUserIdEnd = createUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 创建用户
+    * @return createUserIdIncrement
+    */
+    public Long getCreateUserIdIncrement(){
+        return this.createUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public void setCreateUserIdIncrement(Long createUserIdIncrement){
+        this.createUserIdIncrement = createUserIdIncrement;
+    }
+
+    /**
+    * 获取 创建用户
+    * @return createUserIdList
+    */
+    public List<Long> getCreateUserIdList(){
+        return this.createUserIdList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public void setCreateUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+    }
+
+    /**
+    * 获取 开始 修改时间
+    * @return updateTimeStart
+    */
+    public String getUpdateTimeStart(){
+        return this.updateTimeStart;
+    }
+
+    /**
+    * 设置 开始 修改时间
+    * @param updateTimeStart
+    */
+    public void setUpdateTimeStart(String updateTimeStart){
+        this.updateTimeStart = updateTimeStart;
+    }
+
+    /**
+    * 获取 结束 修改时间
+    * @return updateTimeEnd
+    */
+    public String getUpdateTimeEnd(){
+        return this.updateTimeEnd;
+    }
+
+    /**
+    * 设置 结束 修改时间
+    * @param updateTimeEnd
+    */
+    public void setUpdateTimeEnd(String updateTimeEnd){
+        this.updateTimeEnd = updateTimeEnd;
+    }
+
+    /**
+    * 设置  序号，主键，自增长
+    * @param id
+    */
+    public SkinBaseQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 序号，主键，自增长
+    * @param idStart
+    */
+    public SkinBaseQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 序号，主键，自增长
+    * @param idEnd
+    */
+    public SkinBaseQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 序号，主键，自增长
+    * @param idIncrement
+    */
+    public SkinBaseQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idList
+    */
+    public SkinBaseQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+    /**
+    * 设置  所属种类,来源种类
+    * @param categoryId
+    */
+    public SkinBaseQuery categoryId(Long categoryId){
+	    setCategoryId(categoryId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 所属种类,来源种类
+    * @param categoryIdStart
+    */
+    public SkinBaseQuery categoryIdStart(Long categoryIdStart){
+		this.categoryIdStart = categoryIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 所属种类,来源种类
+    * @param categoryIdEnd
+    */
+    public SkinBaseQuery categoryIdEnd(Long categoryIdEnd){
+		this.categoryIdEnd = categoryIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 所属种类,来源种类
+    * @param categoryIdIncrement
+    */
+    public SkinBaseQuery categoryIdIncrement(Long categoryIdIncrement){
+		this.categoryIdIncrement = categoryIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 所属种类,来源种类
+    * @param categoryIdList
+    */
+    public SkinBaseQuery categoryIdList(List<Long> categoryIdList){
+        this.categoryIdList = categoryIdList;
+		return this;
+        }
+
+
+	/**
+    * 设置 设备类型  (pdj.排队机，ckp.窗口屏，hjq.呼叫器，jzxsp.集中显示屏，dsj.导视机，pjq.评级器，zzfwzd.自助服务终端，tdj.填单机，ybj.样表机)
+    * @param deviceType
+    */
+    public SkinBaseQuery deviceType(String deviceType){
+        setDeviceType(deviceType);
+		return this;
+    }
+
+    /**
+    * 设置 设备类型  (pdj.排队机，ckp.窗口屏，hjq.呼叫器，jzxsp.集中显示屏，dsj.导视机，pjq.评级器，zzfwzd.自助服务终端，tdj.填单机，ybj.样表机)
+    * @param deviceTypeList
+    */
+    public SkinBaseQuery deviceTypeList(List<String> deviceTypeList){
+        this.deviceTypeList = deviceTypeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 皮肤名称
+    * @param shortName
+    */
+    public SkinBaseQuery shortName(String shortName){
+        setShortName(shortName);
+		return this;
+    }
+
+    /**
+    * 设置 皮肤名称
+    * @param shortNameList
+    */
+    public SkinBaseQuery shortNameList(List<String> shortNameList){
+        this.shortNameList = shortNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 分辨率 (1.1920*1080，2.1080*1920，3.1280*1280)
+    * @param imageResolution
+    */
+    public SkinBaseQuery imageResolution(String imageResolution){
+        setImageResolution(imageResolution);
+		return this;
+    }
+
+    /**
+    * 设置 分辨率 (1.1920*1080，2.1080*1920，3.1280*1280)
+    * @param imageResolutionList
+    */
+    public SkinBaseQuery imageResolutionList(List<String> imageResolutionList){
+        this.imageResolutionList = imageResolutionList;
+		return this;
+    }
+
+
+	/**
+    * 设置 背景大图
+    * @param backgroundImagePath
+    */
+    public SkinBaseQuery backgroundImagePath(String backgroundImagePath){
+        setBackgroundImagePath(backgroundImagePath);
+		return this;
+    }
+
+    /**
+    * 设置 背景大图
+    * @param backgroundImagePathList
+    */
+    public SkinBaseQuery backgroundImagePathList(List<String> backgroundImagePathList){
+        this.backgroundImagePathList = backgroundImagePathList;
+		return this;
+    }
+
+
+	/**
+    * 设置 现场取号图片
+    * @param sceneNumImagePath
+    */
+    public SkinBaseQuery sceneNumImagePath(String sceneNumImagePath){
+        setSceneNumImagePath(sceneNumImagePath);
+		return this;
+    }
+
+    /**
+    * 设置 现场取号图片
+    * @param sceneNumImagePathList
+    */
+    public SkinBaseQuery sceneNumImagePathList(List<String> sceneNumImagePathList){
+        this.sceneNumImagePathList = sceneNumImagePathList;
+		return this;
+    }
+
+
+	/**
+    * 设置 预约取号图片
+    * @param bookingNumImagePath
+    */
+    public SkinBaseQuery bookingNumImagePath(String bookingNumImagePath){
+        setBookingNumImagePath(bookingNumImagePath);
+		return this;
+    }
+
+    /**
+    * 设置 预约取号图片
+    * @param bookingNumImagePathList
+    */
+    public SkinBaseQuery bookingNumImagePathList(List<String> bookingNumImagePathList){
+        this.bookingNumImagePathList = bookingNumImagePathList;
+		return this;
+    }
+
+
+	/**
+    * 设置 vip取号图片
+    * @param vipNumImagePath
+    */
+    public SkinBaseQuery vipNumImagePath(String vipNumImagePath){
+        setVipNumImagePath(vipNumImagePath);
+		return this;
+    }
+
+    /**
+    * 设置 vip取号图片
+    * @param vipNumImagePathList
+    */
+    public SkinBaseQuery vipNumImagePathList(List<String> vipNumImagePathList){
+        this.vipNumImagePathList = vipNumImagePathList;
+		return this;
+    }
+
+
+	/**
+    * 设置 重打小票图片
+    * @param smallTicketNumImagePath
+    */
+    public SkinBaseQuery smallTicketNumImagePath(String smallTicketNumImagePath){
+        setSmallTicketNumImagePath(smallTicketNumImagePath);
+		return this;
+    }
+
+    /**
+    * 设置 重打小票图片
+    * @param smallTicketNumImagePathList
+    */
+    public SkinBaseQuery smallTicketNumImagePathList(List<String> smallTicketNumImagePathList){
+        this.smallTicketNumImagePathList = smallTicketNumImagePathList;
+		return this;
+    }
+
+
+	/**
+    * 设置 现场签到图片
+    * @param sceneSignImagePath
+    */
+    public SkinBaseQuery sceneSignImagePath(String sceneSignImagePath){
+        setSceneSignImagePath(sceneSignImagePath);
+		return this;
+    }
+
+    /**
+    * 设置 现场签到图片
+    * @param sceneSignImagePathList
+    */
+    public SkinBaseQuery sceneSignImagePathList(List<String> sceneSignImagePathList){
+        this.sceneSignImagePathList = sceneSignImagePathList;
+		return this;
+    }
+
+
+	/**
+    * 设置 政务网取号图片
+    * @param govNumImagePath
+    */
+    public SkinBaseQuery govNumImagePath(String govNumImagePath){
+        setGovNumImagePath(govNumImagePath);
+		return this;
+    }
+
+    /**
+    * 设置 政务网取号图片
+    * @param govNumImagePathList
+    */
+    public SkinBaseQuery govNumImagePathList(List<String> govNumImagePathList){
+        this.govNumImagePathList = govNumImagePathList;
+		return this;
+    }
+
+
+	/**
+    * 设置 标题颜色
+    * @param titleColorStyle
+    */
+    public SkinBaseQuery titleColorStyle(String titleColorStyle){
+        setTitleColorStyle(titleColorStyle);
+		return this;
+    }
+
+    /**
+    * 设置 标题颜色
+    * @param titleColorStyleList
+    */
+    public SkinBaseQuery titleColorStyleList(List<String> titleColorStyleList){
+        this.titleColorStyleList = titleColorStyleList;
+		return this;
+    }
+
+
+	/**
+    * 设置 时间颜色
+    * @param timeColorStyle
+    */
+    public SkinBaseQuery timeColorStyle(String timeColorStyle){
+        setTimeColorStyle(timeColorStyle);
+		return this;
+    }
+
+    /**
+    * 设置 时间颜色
+    * @param timeColorStyleList
+    */
+    public SkinBaseQuery timeColorStyleList(List<String> timeColorStyleList){
+        this.timeColorStyleList = timeColorStyleList;
+		return this;
+    }
+
+
+	/**
+    * 设置 数据标题颜色
+    * @param dataTitleColorStyle
+    */
+    public SkinBaseQuery dataTitleColorStyle(String dataTitleColorStyle){
+        setDataTitleColorStyle(dataTitleColorStyle);
+		return this;
+    }
+
+    /**
+    * 设置 数据标题颜色
+    * @param dataTitleColorStyleList
+    */
+    public SkinBaseQuery dataTitleColorStyleList(List<String> dataTitleColorStyleList){
+        this.dataTitleColorStyleList = dataTitleColorStyleList;
+		return this;
+    }
+
+
+	/**
+    * 设置 数据颜色
+    * @param dataColorStyle
+    */
+    public SkinBaseQuery dataColorStyle(String dataColorStyle){
+        setDataColorStyle(dataColorStyle);
+		return this;
+    }
+
+    /**
+    * 设置 数据颜色
+    * @param dataColorStyleList
+    */
+    public SkinBaseQuery dataColorStyleList(List<String> dataColorStyleList){
+        this.dataColorStyleList = dataColorStyleList;
+		return this;
+    }
+
+
+	/**
+    * 设置 备案颜色
+    * @param recordColorStyle
+    */
+    public SkinBaseQuery recordColorStyle(String recordColorStyle){
+        setRecordColorStyle(recordColorStyle);
+		return this;
+    }
+
+    /**
+    * 设置 备案颜色
+    * @param recordColorStyleList
+    */
+    public SkinBaseQuery recordColorStyleList(List<String> recordColorStyleList){
+        this.recordColorStyleList = recordColorStyleList;
+		return this;
+    }
+
+
+	/**
+    * 设置 预览图片
+    * @param previewImagePath
+    */
+    public SkinBaseQuery previewImagePath(String previewImagePath){
+        setPreviewImagePath(previewImagePath);
+		return this;
+    }
+
+    /**
+    * 设置 预览图片
+    * @param previewImagePathList
+    */
+    public SkinBaseQuery previewImagePathList(List<String> previewImagePathList){
+        this.previewImagePathList = previewImagePathList;
+		return this;
+    }
+
+    /**
+    * 设置  排序编号
+    * @param sortNum
+    */
+    public SkinBaseQuery sortNum(Integer sortNum){
+	    setSortNum(sortNum);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 排序编号
+    * @param sortNumStart
+    */
+    public SkinBaseQuery sortNumStart(Integer sortNumStart){
+		this.sortNumStart = sortNumStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 排序编号
+    * @param sortNumEnd
+    */
+    public SkinBaseQuery sortNumEnd(Integer sortNumEnd){
+		this.sortNumEnd = sortNumEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 排序编号
+    * @param sortNumIncrement
+    */
+    public SkinBaseQuery sortNumIncrement(Integer sortNumIncrement){
+		this.sortNumIncrement = sortNumIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 排序编号
+    * @param sortNumList
+    */
+    public SkinBaseQuery sortNumList(List<Integer> sortNumList){
+        this.sortNumList = sortNumList;
+		return this;
+        }
+
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public SkinBaseQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public SkinBaseQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public SkinBaseQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public SkinBaseQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public SkinBaseQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<SkinBaseQuery> getOrConditionList(){
+    return this.orConditionList;
+    }
+
+    /**
+    * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @param orConditionList
+    */
+    public void setOrConditionList(List<SkinBaseQuery> orConditionList){
+        this.orConditionList = orConditionList;
+    }
+
+    /**
+    * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @return andConditionList
+    */
+    public List<SkinBaseQuery> getAndConditionList(){
+        return this.andConditionList;
+    }
+
+    /**
+    * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @param andConditionList
+    */
+    public void setAndConditionList(List<SkinBaseQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/model/SkinCategoryEntity.java

+package com.mortals.xhx.module.skin.model;
+
+import java.util.List;
+import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.skin.model.vo.SkinCategoryVo;
+/**
+* 系统皮肤分类实体对象
+*
+* @author zxfei
+* @date 2022-05-16
+*/
+
+public class SkinCategoryEntity extends SkinCategoryVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 分类名称
+    */
+    private String name;
+
+
+
+    public SkinCategoryEntity(){}
+    /**
+    * 获取 分类名称
+    * @return String
+    */
+    public String getName(){
+        return name;
+    }
+    /**
+    * 设置 分类名称
+    * @param name
+    */
+    public void setName(String name){
+        this.name = name;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof SkinCategoryEntity) {
+            SkinCategoryEntity tmp = (SkinCategoryEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",name:").append(getName());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.name = "";
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/model/SkinCategoryQuery.java

+package com.mortals.xhx.module.skin.model;
+
+import java.util.List;
+import com.mortals.xhx.module.skin.model.SkinCategoryEntity;
+/**
+* 系统皮肤分类查询对象
+*
+* @author zxfei
+* @date 2022-05-16
+*/
+public class SkinCategoryQuery extends SkinCategoryEntity {
+    /** 开始 序号，主键，自增长 */
+    private Long idStart;
+
+    /** 结束 序号，主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 序号，主键，自增长 */
+    private Long idIncrement;
+
+    /** 序号，主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 分类名称 */
+    private List<String> nameList;
+
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 创建用户 */
+    private Long createUserIdStart;
+
+    /** 结束 创建用户 */
+    private Long createUserIdEnd;
+
+    /** 增加 创建用户 */
+    private Long createUserIdIncrement;
+
+    /** 创建用户列表 */
+    private List <Long> createUserIdList;
+
+    /** 开始 修改时间 */
+    private String updateTimeStart;
+
+    /** 结束 修改时间 */
+    private String updateTimeEnd;
+
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<SkinCategoryQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<SkinCategoryQuery> andConditionList;
+
+    public SkinCategoryQuery(){}
+
+    /**
+    * 获取 开始 序号，主键，自增长
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 序号，主键，自增长
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 序号，主键，自增长
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 序号，主键，自增长
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 序号，主键，自增长
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 序号，主键，自增长
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 序号，主键，自增长
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 分类名称
+    * @return nameList
+    */
+    public List<String> getNameList(){
+        return this.nameList;
+    }
+
+    /**
+    * 设置 分类名称
+    * @param nameList
+    */
+    public void setNameList(List<String> nameList){
+        this.nameList = nameList;
+    }
+    /**
+    * 获取 开始 创建时间
+    * @return createTimeStart
+    */
+    public String getCreateTimeStart(){
+        return this.createTimeStart;
+    }
+
+    /**
+    * 设置 开始 创建时间
+    * @param createTimeStart
+    */
+    public void setCreateTimeStart(String createTimeStart){
+        this.createTimeStart = createTimeStart;
+    }
+
+    /**
+    * 获取 结束 创建时间
+    * @return createTimeEnd
+    */
+    public String getCreateTimeEnd(){
+        return this.createTimeEnd;
+    }
+
+    /**
+    * 设置 结束 创建时间
+    * @param createTimeEnd
+    */
+    public void setCreateTimeEnd(String createTimeEnd){
+        this.createTimeEnd = createTimeEnd;
+    }
+
+    /**
+    * 获取 开始 创建用户
+    * @return createUserIdStart
+    */
+    public Long getCreateUserIdStart(){
+        return this.createUserIdStart;
+    }
+
+    /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public void setCreateUserIdStart(Long createUserIdStart){
+        this.createUserIdStart = createUserIdStart;
+    }
+
+    /**
+    * 获取 结束 创建用户
+    * @return $createUserIdEnd
+    */
+    public Long getCreateUserIdEnd(){
+        return this.createUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public void setCreateUserIdEnd(Long createUserIdEnd){
+        this.createUserIdEnd = createUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 创建用户
+    * @return createUserIdIncrement
+    */
+    public Long getCreateUserIdIncrement(){
+        return this.createUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public void setCreateUserIdIncrement(Long createUserIdIncrement){
+        this.createUserIdIncrement = createUserIdIncrement;
+    }
+
+    /**
+    * 获取 创建用户
+    * @return createUserIdList
+    */
+    public List<Long> getCreateUserIdList(){
+        return this.createUserIdList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public void setCreateUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+    }
+
+    /**
+    * 获取 开始 修改时间
+    * @return updateTimeStart
+    */
+    public String getUpdateTimeStart(){
+        return this.updateTimeStart;
+    }
+
+    /**
+    * 设置 开始 修改时间
+    * @param updateTimeStart
+    */
+    public void setUpdateTimeStart(String updateTimeStart){
+        this.updateTimeStart = updateTimeStart;
+    }
+
+    /**
+    * 获取 结束 修改时间
+    * @return updateTimeEnd
+    */
+    public String getUpdateTimeEnd(){
+        return this.updateTimeEnd;
+    }
+
+    /**
+    * 设置 结束 修改时间
+    * @param updateTimeEnd
+    */
+    public void setUpdateTimeEnd(String updateTimeEnd){
+        this.updateTimeEnd = updateTimeEnd;
+    }
+
+    /**
+    * 设置  序号，主键，自增长
+    * @param id
+    */
+    public SkinCategoryQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 序号，主键，自增长
+    * @param idStart
+    */
+    public SkinCategoryQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 序号，主键，自增长
+    * @param idEnd
+    */
+    public SkinCategoryQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 序号，主键，自增长
+    * @param idIncrement
+    */
+    public SkinCategoryQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idList
+    */
+    public SkinCategoryQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+
+	/**
+    * 设置 分类名称
+    * @param name
+    */
+    public SkinCategoryQuery name(String name){
+        setName(name);
+		return this;
+    }
+
+    /**
+    * 设置 分类名称
+    * @param nameList
+    */
+    public SkinCategoryQuery nameList(List<String> nameList){
+        this.nameList = nameList;
+		return this;
+    }
+
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public SkinCategoryQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public SkinCategoryQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public SkinCategoryQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public SkinCategoryQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public SkinCategoryQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<SkinCategoryQuery> getOrConditionList(){
+    return this.orConditionList;
+    }
+
+    /**
+    * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @param orConditionList
+    */
+    public void setOrConditionList(List<SkinCategoryQuery> orConditionList){
+        this.orConditionList = orConditionList;
+    }
+
+    /**
+    * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @return andConditionList
+    */
+    public List<SkinCategoryQuery> getAndConditionList(){
+        return this.andConditionList;
+    }
+
+    /**
+    * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @param andConditionList
+    */
+    public void setAndConditionList(List<SkinCategoryQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/model/vo/SkinBaseVo.java

+package com.mortals.xhx.module.skin.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.skin.model.SkinBaseEntity;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+/**
+* 系统基础皮肤视图对象
+*
+* @author zxfei
+* @date 2022-05-16
+*/
+@Data
+public class SkinBaseVo extends BaseEntityLong {
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/model/vo/SkinCategoryVo.java

+package com.mortals.xhx.module.skin.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.skin.model.SkinCategoryEntity;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+/**
+* 系统皮肤分类视图对象
+*
+* @author zxfei
+* @date 2022-05-16
+*/
+@Data
+public class SkinCategoryVo extends BaseEntityLong {
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/service/SkinBaseService.java

+package com.mortals.xhx.module.skin.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.skin.model.SkinBaseEntity;
+/**
+* SkinBaseService
+*
+* 系统基础皮肤 service接口
+*
+* @author zxfei
+* @date 2022-05-16
+*/
+public interface SkinBaseService extends ICRUDService<SkinBaseEntity,Long>{
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/service/SkinCategoryService.java

+package com.mortals.xhx.module.skin.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.skin.model.SkinCategoryEntity;
+/**
+* SkinCategoryService
+*
+* 系统皮肤分类 service接口
+*
+* @author zxfei
+* @date 2022-05-16
+*/
+public interface SkinCategoryService extends ICRUDService<SkinCategoryEntity,Long>{
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinBaseServiceImpl.java

+package com.mortals.xhx.module.skin.service.impl;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.xhx.module.skin.dao.SkinBaseDao;
+import com.mortals.xhx.module.skin.model.SkinBaseEntity;
+import com.mortals.xhx.module.skin.service.SkinBaseService;
+/**
+* SkinBaseService
+* 系统基础皮肤 service实现
+*
+* @author zxfei
+* @date 2022-05-16
+*/
+@Service("skinBaseService")
+public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, SkinBaseEntity, Long> implements SkinBaseService {
+    
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinCategoryServiceImpl.java

+package com.mortals.xhx.module.skin.service.impl;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.xhx.module.skin.dao.SkinCategoryDao;
+import com.mortals.xhx.module.skin.model.SkinCategoryEntity;
+import com.mortals.xhx.module.skin.service.SkinCategoryService;
+/**
+* SkinCategoryService
+* 系统皮肤分类 service实现
+*
+* @author zxfei
+* @date 2022-05-16
+*/
+@Service("skinCategoryService")
+public class SkinCategoryServiceImpl extends AbstractCRUDServiceImpl<SkinCategoryDao, SkinCategoryEntity, Long> implements SkinCategoryService {
+    
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinBaseController.java

+package com.mortals.xhx.module.skin.web;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import com.mortals.framework.model.Context;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.module.skin.model.SkinBaseEntity;
+import com.mortals.xhx.module.skin.model.SkinBaseQuery;
+import com.mortals.xhx.module.skin.service.SkinBaseService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONObject;
+import java.util.Arrays;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import static com.mortals.framework.ap.SysConstains.*;
+/**
+*
+* 系统基础皮肤
+*
+* @author zxfei
+* @date 2022-05-16
+*/
+@RestController
+@RequestMapping("skin/base")
+public class SkinBaseController extends BaseCRUDJsonBodyMappingController<SkinBaseService,SkinBaseEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public SkinBaseController(){
+        super.setFormClass(SkinBaseForm.class);
+        super.setModuleDesc( "系统基础皮肤");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        this.addDict(model, "deviceType", paramService.getParamBySecondOrganize("SkinBase","deviceType"));
+        this.addDict(model, "imageResolution", paramService.getParamBySecondOrganize("SkinBase","imageResolution"));
+        super.init(model, context);
+    }
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinBaseForm.java

+package com.mortals.xhx.module.skin.web;
+
+
+import com.mortals.framework.web.BaseCRUDFormLong;
+import com.mortals.xhx.module.skin.model.SkinBaseEntity;
+import com.mortals.xhx.module.skin.model.SkinBaseQuery;
+
+/**
+* SkinBase
+*
+* 系统基础皮肤 Form
+*
+* @author zxfei
+* @date 2022-05-16
+*/
+public class SkinBaseForm extends BaseCRUDFormLong<SkinBaseEntity> {
+    private SkinBaseEntity entity = new SkinBaseEntity();
+    private SkinBaseQuery query = new SkinBaseQuery();
+    public SkinBaseForm(){
+    }
+
+    @Override
+    public SkinBaseEntity getEntity() {
+        return entity;
+    }
+
+    public void setSkinBase(SkinBaseEntity entity) {
+        this.entity = entity;
+    }
+
+    @Override
+    public SkinBaseQuery getQuery() {
+        return query;
+    }
+
+    public void setQuery(SkinBaseQuery query) {
+        this.query = query;
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinCategoryController.java

+package com.mortals.xhx.module.skin.web;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import com.mortals.framework.model.Context;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.module.skin.model.SkinCategoryEntity;
+import com.mortals.xhx.module.skin.model.SkinCategoryQuery;
+import com.mortals.xhx.module.skin.service.SkinCategoryService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONObject;
+import java.util.Arrays;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import static com.mortals.framework.ap.SysConstains.*;
+/**
+*
+* 系统皮肤分类
+*
+* @author zxfei
+* @date 2022-05-16
+*/
+@RestController
+@RequestMapping("skin/category")
+public class SkinCategoryController extends BaseCRUDJsonBodyMappingController<SkinCategoryService,SkinCategoryEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public SkinCategoryController(){
+        super.setFormClass(SkinCategoryForm.class);
+        super.setModuleDesc( "系统皮肤分类");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinCategoryForm.java

+package com.mortals.xhx.module.skin.web;
+
+
+import com.mortals.framework.web.BaseCRUDFormLong;
+import com.mortals.xhx.module.skin.model.SkinCategoryEntity;
+import com.mortals.xhx.module.skin.model.SkinCategoryQuery;
+
+/**
+* SkinCategory
+*
+* 系统皮肤分类 Form
+*
+* @author zxfei
+* @date 2022-05-16
+*/
+public class SkinCategoryForm extends BaseCRUDFormLong<SkinCategoryEntity> {
+    private SkinCategoryEntity entity = new SkinCategoryEntity();
+    private SkinCategoryQuery query = new SkinCategoryQuery();
+    public SkinCategoryForm(){
+    }
+
+    @Override
+    public SkinCategoryEntity getEntity() {
+        return entity;
+    }
+
+    public void setSkinCategory(SkinCategoryEntity entity) {
+        this.entity = entity;
+    }
+
+    @Override
+    public SkinCategoryQuery getQuery() {
+        return query;
+    }
+
+    public void setQuery(SkinCategoryQuery query) {
+        this.query = query;
+    }
+}
\ No newline at end of file

base-manager/src/main/resources/sqlmap/module/skin/SkinBaseMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.skin.dao.ibatis.SkinBaseDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="SkinBaseEntity" id="SkinBaseEntity-Map">
+            <id  property="id" column="id" />
+            <result property="categoryId" column="categoryId" />
+            <result property="deviceType" column="deviceType" />
+            <result property="shortName" column="shortName" />
+            <result property="imageResolution" column="imageResolution" />
+            <result property="backgroundImagePath" column="backgroundImagePath" />
+            <result property="sceneNumImagePath" column="sceneNumImagePath" />
+            <result property="bookingNumImagePath" column="bookingNumImagePath" />
+            <result property="vipNumImagePath" column="vipNumImagePath" />
+            <result property="smallTicketNumImagePath" column="smallTicketNumImagePath" />
+            <result property="sceneSignImagePath" column="sceneSignImagePath" />
+            <result property="govNumImagePath" column="govNumImagePath" />
+            <result property="titleColorStyle" column="titleColorStyle" />
+            <result property="timeColorStyle" column="timeColorStyle" />
+            <result property="dataTitleColorStyle" column="dataTitleColorStyle" />
+            <result property="dataColorStyle" column="dataColorStyle" />
+            <result property="recordColorStyle" column="recordColorStyle" />
+            <result property="previewImagePath" column="previewImagePath" />
+            <result property="sortNum" column="sortNum" />
+            <result property="createTime" column="createTime" />
+            <result property="createUserId" column="createUserId" />
+            <result property="updateTime" column="updateTime" />
+            
+    </resultMap>
+
+
+    <!-- 表所有列 -->
+    <sql id="_columns">
+        <trim suffixOverrides="," suffix="">
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
+                    a.id,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryId') or colPickMode == 1 and data.containsKey('categoryId')))">
+                    a.categoryId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceType') or colPickMode == 1 and data.containsKey('deviceType')))">
+                    a.deviceType,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('shortName') or colPickMode == 1 and data.containsKey('shortName')))">
+                    a.shortName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('imageResolution') or colPickMode == 1 and data.containsKey('imageResolution')))">
+                    a.imageResolution,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('backgroundImagePath') or colPickMode == 1 and data.containsKey('backgroundImagePath')))">
+                    a.backgroundImagePath,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sceneNumImagePath') or colPickMode == 1 and data.containsKey('sceneNumImagePath')))">
+                    a.sceneNumImagePath,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('bookingNumImagePath') or colPickMode == 1 and data.containsKey('bookingNumImagePath')))">
+                    a.bookingNumImagePath,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('vipNumImagePath') or colPickMode == 1 and data.containsKey('vipNumImagePath')))">
+                    a.vipNumImagePath,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('smallTicketNumImagePath') or colPickMode == 1 and data.containsKey('smallTicketNumImagePath')))">
+                    a.smallTicketNumImagePath,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sceneSignImagePath') or colPickMode == 1 and data.containsKey('sceneSignImagePath')))">
+                    a.sceneSignImagePath,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('govNumImagePath') or colPickMode == 1 and data.containsKey('govNumImagePath')))">
+                    a.govNumImagePath,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('titleColorStyle') or colPickMode == 1 and data.containsKey('titleColorStyle')))">
+                    a.titleColorStyle,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('timeColorStyle') or colPickMode == 1 and data.containsKey('timeColorStyle')))">
+                    a.timeColorStyle,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('dataTitleColorStyle') or colPickMode == 1 and data.containsKey('dataTitleColorStyle')))">
+                    a.dataTitleColorStyle,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('dataColorStyle') or colPickMode == 1 and data.containsKey('dataColorStyle')))">
+                    a.dataColorStyle,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('recordColorStyle') or colPickMode == 1 and data.containsKey('recordColorStyle')))">
+                    a.recordColorStyle,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('previewImagePath') or colPickMode == 1 and data.containsKey('previewImagePath')))">
+                    a.previewImagePath,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sortNum') or colPickMode == 1 and data.containsKey('sortNum')))">
+                    a.sortNum,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                    a.createTime,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+                    a.createUserId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+                    a.updateTime,
+                </if>
+        </trim>
+    </sql>
+    <!-- 新增 区分主键自增加还是业务插入 -->
+    <insert id="insert" parameterType="SkinBaseEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_sys_skin_base
+        (categoryId,deviceType,shortName,imageResolution,backgroundImagePath,sceneNumImagePath,bookingNumImagePath,vipNumImagePath,smallTicketNumImagePath,sceneSignImagePath,govNumImagePath,titleColorStyle,timeColorStyle,dataTitleColorStyle,dataColorStyle,recordColorStyle,previewImagePath,sortNum,createTime,createUserId,updateTime)
+        VALUES
+        (#{categoryId},#{deviceType},#{shortName},#{imageResolution},#{backgroundImagePath},#{sceneNumImagePath},#{bookingNumImagePath},#{vipNumImagePath},#{smallTicketNumImagePath},#{sceneSignImagePath},#{govNumImagePath},#{titleColorStyle},#{timeColorStyle},#{dataTitleColorStyle},#{dataColorStyle},#{recordColorStyle},#{previewImagePath},#{sortNum},#{createTime},#{createUserId},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_sys_skin_base
+        (categoryId,deviceType,shortName,imageResolution,backgroundImagePath,sceneNumImagePath,bookingNumImagePath,vipNumImagePath,smallTicketNumImagePath,sceneSignImagePath,govNumImagePath,titleColorStyle,timeColorStyle,dataTitleColorStyle,dataColorStyle,recordColorStyle,previewImagePath,sortNum,createTime,createUserId,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.categoryId},#{item.deviceType},#{item.shortName},#{item.imageResolution},#{item.backgroundImagePath},#{item.sceneNumImagePath},#{item.bookingNumImagePath},#{item.vipNumImagePath},#{item.smallTicketNumImagePath},#{item.sceneSignImagePath},#{item.govNumImagePath},#{item.titleColorStyle},#{item.timeColorStyle},#{item.dataTitleColorStyle},#{item.dataColorStyle},#{item.recordColorStyle},#{item.previewImagePath},#{item.sortNum},#{item.createTime},#{item.createUserId},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_sys_skin_base as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('categoryId')) or (colPickMode==1 and !data.containsKey('categoryId'))">
+                a.categoryId=#{data.categoryId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryIdIncrement')) or (colPickMode==1 and !data.containsKey('categoryIdIncrement'))">
+                a.categoryId=ifnull(a.categoryId,0) + #{data.categoryIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('deviceType')) or (colPickMode==1 and !data.containsKey('deviceType'))">
+                a.deviceType=#{data.deviceType},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('shortName')) or (colPickMode==1 and !data.containsKey('shortName'))">
+                a.shortName=#{data.shortName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('imageResolution')) or (colPickMode==1 and !data.containsKey('imageResolution'))">
+                a.imageResolution=#{data.imageResolution},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('backgroundImagePath')) or (colPickMode==1 and !data.containsKey('backgroundImagePath'))">
+                a.backgroundImagePath=#{data.backgroundImagePath},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('sceneNumImagePath')) or (colPickMode==1 and !data.containsKey('sceneNumImagePath'))">
+                a.sceneNumImagePath=#{data.sceneNumImagePath},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('bookingNumImagePath')) or (colPickMode==1 and !data.containsKey('bookingNumImagePath'))">
+                a.bookingNumImagePath=#{data.bookingNumImagePath},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('vipNumImagePath')) or (colPickMode==1 and !data.containsKey('vipNumImagePath'))">
+                a.vipNumImagePath=#{data.vipNumImagePath},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('smallTicketNumImagePath')) or (colPickMode==1 and !data.containsKey('smallTicketNumImagePath'))">
+                a.smallTicketNumImagePath=#{data.smallTicketNumImagePath},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('sceneSignImagePath')) or (colPickMode==1 and !data.containsKey('sceneSignImagePath'))">
+                a.sceneSignImagePath=#{data.sceneSignImagePath},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('govNumImagePath')) or (colPickMode==1 and !data.containsKey('govNumImagePath'))">
+                a.govNumImagePath=#{data.govNumImagePath},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('titleColorStyle')) or (colPickMode==1 and !data.containsKey('titleColorStyle'))">
+                a.titleColorStyle=#{data.titleColorStyle},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('timeColorStyle')) or (colPickMode==1 and !data.containsKey('timeColorStyle'))">
+                a.timeColorStyle=#{data.timeColorStyle},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('dataTitleColorStyle')) or (colPickMode==1 and !data.containsKey('dataTitleColorStyle'))">
+                a.dataTitleColorStyle=#{data.dataTitleColorStyle},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('dataColorStyle')) or (colPickMode==1 and !data.containsKey('dataColorStyle'))">
+                a.dataColorStyle=#{data.dataColorStyle},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('recordColorStyle')) or (colPickMode==1 and !data.containsKey('recordColorStyle'))">
+                a.recordColorStyle=#{data.recordColorStyle},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('previewImagePath')) or (colPickMode==1 and !data.containsKey('previewImagePath'))">
+                a.previewImagePath=#{data.previewImagePath},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('sortNum')) or (colPickMode==1 and !data.containsKey('sortNum'))">
+                a.sortNum=#{data.sortNum},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('sortNumIncrement')) or (colPickMode==1 and !data.containsKey('sortNumIncrement'))">
+                a.sortNum=ifnull(a.sortNum,0) + #{data.sortNumIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
+                a.createTime=#{data.createTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
+                a.createUserId=#{data.createUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
+                a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
+                a.updateTime=#{data.updateTime},
+            </if>
+        </trim>
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </update>
+    <!-- 批量更新 -->
+    <update id="updateBatch" parameterType="paramDto">
+        update mortals_sys_skin_base as a
+        <trim prefix="set" suffixOverrides=",">
+                        <trim prefix="categoryId=(case" suffix="ELSE categoryId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('categoryId')) or (colPickMode==1 and !item.containsKey('categoryId'))">
+                                        when a.id=#{item.id} then #{item.categoryId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('categoryIdIncrement')) or (colPickMode==1 and !item.containsKey('categoryIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.categoryId,0) + #{item.categoryIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="deviceType=(case" suffix="ELSE deviceType end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('deviceType')) or (colPickMode==1 and !item.containsKey('deviceType'))">
+                            when a.id=#{item.id} then #{item.deviceType}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="shortName=(case" suffix="ELSE shortName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('shortName')) or (colPickMode==1 and !item.containsKey('shortName'))">
+                            when a.id=#{item.id} then #{item.shortName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="imageResolution=(case" suffix="ELSE imageResolution end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('imageResolution')) or (colPickMode==1 and !item.containsKey('imageResolution'))">
+                            when a.id=#{item.id} then #{item.imageResolution}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="backgroundImagePath=(case" suffix="ELSE backgroundImagePath end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('backgroundImagePath')) or (colPickMode==1 and !item.containsKey('backgroundImagePath'))">
+                            when a.id=#{item.id} then #{item.backgroundImagePath}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="sceneNumImagePath=(case" suffix="ELSE sceneNumImagePath end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('sceneNumImagePath')) or (colPickMode==1 and !item.containsKey('sceneNumImagePath'))">
+                            when a.id=#{item.id} then #{item.sceneNumImagePath}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="bookingNumImagePath=(case" suffix="ELSE bookingNumImagePath end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('bookingNumImagePath')) or (colPickMode==1 and !item.containsKey('bookingNumImagePath'))">
+                            when a.id=#{item.id} then #{item.bookingNumImagePath}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="vipNumImagePath=(case" suffix="ELSE vipNumImagePath end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('vipNumImagePath')) or (colPickMode==1 and !item.containsKey('vipNumImagePath'))">
+                            when a.id=#{item.id} then #{item.vipNumImagePath}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="smallTicketNumImagePath=(case" suffix="ELSE smallTicketNumImagePath end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('smallTicketNumImagePath')) or (colPickMode==1 and !item.containsKey('smallTicketNumImagePath'))">
+                            when a.id=#{item.id} then #{item.smallTicketNumImagePath}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="sceneSignImagePath=(case" suffix="ELSE sceneSignImagePath end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('sceneSignImagePath')) or (colPickMode==1 and !item.containsKey('sceneSignImagePath'))">
+                            when a.id=#{item.id} then #{item.sceneSignImagePath}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="govNumImagePath=(case" suffix="ELSE govNumImagePath end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('govNumImagePath')) or (colPickMode==1 and !item.containsKey('govNumImagePath'))">
+                            when a.id=#{item.id} then #{item.govNumImagePath}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="titleColorStyle=(case" suffix="ELSE titleColorStyle end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('titleColorStyle')) or (colPickMode==1 and !item.containsKey('titleColorStyle'))">
+                            when a.id=#{item.id} then #{item.titleColorStyle}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="timeColorStyle=(case" suffix="ELSE timeColorStyle end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('timeColorStyle')) or (colPickMode==1 and !item.containsKey('timeColorStyle'))">
+                            when a.id=#{item.id} then #{item.timeColorStyle}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="dataTitleColorStyle=(case" suffix="ELSE dataTitleColorStyle end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('dataTitleColorStyle')) or (colPickMode==1 and !item.containsKey('dataTitleColorStyle'))">
+                            when a.id=#{item.id} then #{item.dataTitleColorStyle}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="dataColorStyle=(case" suffix="ELSE dataColorStyle end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('dataColorStyle')) or (colPickMode==1 and !item.containsKey('dataColorStyle'))">
+                            when a.id=#{item.id} then #{item.dataColorStyle}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="recordColorStyle=(case" suffix="ELSE recordColorStyle end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('recordColorStyle')) or (colPickMode==1 and !item.containsKey('recordColorStyle'))">
+                            when a.id=#{item.id} then #{item.recordColorStyle}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="previewImagePath=(case" suffix="ELSE previewImagePath end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('previewImagePath')) or (colPickMode==1 and !item.containsKey('previewImagePath'))">
+                            when a.id=#{item.id} then #{item.previewImagePath}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="sortNum=(case" suffix="ELSE sortNum end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('sortNum')) or (colPickMode==1 and !item.containsKey('sortNum'))">
+                                        when a.id=#{item.id} then #{item.sortNum}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('sortNumIncrement')) or (colPickMode==1 and !item.containsKey('sortNumIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.sortNum,0) + #{item.sortNumIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+                            when a.id=#{item.id} then #{item.createTime}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
+                                        when a.id=#{item.id} then #{item.createUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+                            when a.id=#{item.id} then #{item.updateTime}
+                        </if>
+                    </foreach>
+                </trim>
+        </trim>
+        where id in
+        <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </update>
+    <!-- 根据主健查询 -->
+    <select id="getByKey" parameterType="paramDto" resultMap="SkinBaseEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_skin_base as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_sys_skin_base as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_sys_skin_base where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_sys_skin_base as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="SkinBaseEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_skin_base as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+        <include refid="_orderCols_"/>
+    </select>
+
+
+
+    <!-- 获取 -->
+    <select id="getListCount" parameterType="paramDto" resultType="int">
+        select count(1)
+        from mortals_sys_skin_base as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </select>
+    <!-- 条件映射 -->
+    <sql id="_condition_">
+        <if test="condition != null and !condition.isEmpty()">
+            <!-- 条件映射-普通条件 -->
+            <include refid="_condition_param_">
+                <property name="_conditionParam_" value="condition"/>
+                <property name="_conditionType_" value="and"/>
+            </include>
+            <!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
+            <if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
+                and
+                <foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
+                    <trim prefixOverrides="or" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="andCondition"/>
+                            <property name="_conditionType_" value="or"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+            <!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
+            <if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
+                and
+                <foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
+                    <trim prefixOverrides="and" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="orCondition"/>
+                            <property name="_conditionType_" value="and"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+        </if>
+    </sql>
+    <!-- 条件映射-代参数 -->
+    <sql id="_condition_param_">
+        <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null">
+                ${_conditionType_} a.id=#{${_conditionParam_}.id}
+            </if>
+        </if>
+            <if test="conditionParamRef.containsKey('id')">
+                <if test="conditionParamRef.id != null ">
+                    ${_conditionType_} a.id = #{${_conditionParam_}.id}
+                </if>
+                <if test="conditionParamRef.id == null">
+                    ${_conditionType_} a.id is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('idList')">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
+                ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+            </if>
+            <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+                ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('categoryId')">
+                <if test="conditionParamRef.categoryId != null ">
+                    ${_conditionType_} a.categoryId = #{${_conditionParam_}.categoryId}
+                </if>
+                <if test="conditionParamRef.categoryId == null">
+                    ${_conditionType_} a.categoryId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdList')">
+                ${_conditionType_} a.categoryId in
+                <foreach collection="conditionParamRef.categoryIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdStart') and conditionParamRef.categoryIdStart != null">
+                ${_conditionType_} a.categoryId <![CDATA[ >= ]]> #{${_conditionParam_}.categoryIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdEnd') and conditionParamRef.categoryIdEnd != null">
+                ${_conditionType_} a.categoryId <![CDATA[ <= ]]> #{${_conditionParam_}.categoryIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('deviceType')">
+                <if test="conditionParamRef.deviceType != null and conditionParamRef.deviceType != ''">
+                    ${_conditionType_} a.deviceType like #{${_conditionParam_}.deviceType}
+                </if>
+                <if test="conditionParamRef.deviceType == null">
+                    ${_conditionType_} a.deviceType is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceTypeList')">
+                ${_conditionType_} a.deviceType in
+                <foreach collection="conditionParamRef.deviceTypeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('shortName')">
+                <if test="conditionParamRef.shortName != null and conditionParamRef.shortName != ''">
+                    ${_conditionType_} a.shortName like #{${_conditionParam_}.shortName}
+                </if>
+                <if test="conditionParamRef.shortName == null">
+                    ${_conditionType_} a.shortName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('shortNameList')">
+                ${_conditionType_} a.shortName in
+                <foreach collection="conditionParamRef.shortNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('imageResolution')">
+                <if test="conditionParamRef.imageResolution != null and conditionParamRef.imageResolution != ''">
+                    ${_conditionType_} a.imageResolution like #{${_conditionParam_}.imageResolution}
+                </if>
+                <if test="conditionParamRef.imageResolution == null">
+                    ${_conditionType_} a.imageResolution is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('imageResolutionList')">
+                ${_conditionType_} a.imageResolution in
+                <foreach collection="conditionParamRef.imageResolutionList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('backgroundImagePath')">
+                <if test="conditionParamRef.backgroundImagePath != null and conditionParamRef.backgroundImagePath != ''">
+                    ${_conditionType_} a.backgroundImagePath like #{${_conditionParam_}.backgroundImagePath}
+                </if>
+                <if test="conditionParamRef.backgroundImagePath == null">
+                    ${_conditionType_} a.backgroundImagePath is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('backgroundImagePathList')">
+                ${_conditionType_} a.backgroundImagePath in
+                <foreach collection="conditionParamRef.backgroundImagePathList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('sceneNumImagePath')">
+                <if test="conditionParamRef.sceneNumImagePath != null and conditionParamRef.sceneNumImagePath != ''">
+                    ${_conditionType_} a.sceneNumImagePath like #{${_conditionParam_}.sceneNumImagePath}
+                </if>
+                <if test="conditionParamRef.sceneNumImagePath == null">
+                    ${_conditionType_} a.sceneNumImagePath is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('sceneNumImagePathList')">
+                ${_conditionType_} a.sceneNumImagePath in
+                <foreach collection="conditionParamRef.sceneNumImagePathList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('bookingNumImagePath')">
+                <if test="conditionParamRef.bookingNumImagePath != null and conditionParamRef.bookingNumImagePath != ''">
+                    ${_conditionType_} a.bookingNumImagePath like #{${_conditionParam_}.bookingNumImagePath}
+                </if>
+                <if test="conditionParamRef.bookingNumImagePath == null">
+                    ${_conditionType_} a.bookingNumImagePath is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('bookingNumImagePathList')">
+                ${_conditionType_} a.bookingNumImagePath in
+                <foreach collection="conditionParamRef.bookingNumImagePathList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('vipNumImagePath')">
+                <if test="conditionParamRef.vipNumImagePath != null and conditionParamRef.vipNumImagePath != ''">
+                    ${_conditionType_} a.vipNumImagePath like #{${_conditionParam_}.vipNumImagePath}
+                </if>
+                <if test="conditionParamRef.vipNumImagePath == null">
+                    ${_conditionType_} a.vipNumImagePath is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('vipNumImagePathList')">
+                ${_conditionType_} a.vipNumImagePath in
+                <foreach collection="conditionParamRef.vipNumImagePathList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('smallTicketNumImagePath')">
+                <if test="conditionParamRef.smallTicketNumImagePath != null and conditionParamRef.smallTicketNumImagePath != ''">
+                    ${_conditionType_} a.smallTicketNumImagePath like #{${_conditionParam_}.smallTicketNumImagePath}
+                </if>
+                <if test="conditionParamRef.smallTicketNumImagePath == null">
+                    ${_conditionType_} a.smallTicketNumImagePath is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('smallTicketNumImagePathList')">
+                ${_conditionType_} a.smallTicketNumImagePath in
+                <foreach collection="conditionParamRef.smallTicketNumImagePathList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('sceneSignImagePath')">
+                <if test="conditionParamRef.sceneSignImagePath != null and conditionParamRef.sceneSignImagePath != ''">
+                    ${_conditionType_} a.sceneSignImagePath like #{${_conditionParam_}.sceneSignImagePath}
+                </if>
+                <if test="conditionParamRef.sceneSignImagePath == null">
+                    ${_conditionType_} a.sceneSignImagePath is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('sceneSignImagePathList')">
+                ${_conditionType_} a.sceneSignImagePath in
+                <foreach collection="conditionParamRef.sceneSignImagePathList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('govNumImagePath')">
+                <if test="conditionParamRef.govNumImagePath != null and conditionParamRef.govNumImagePath != ''">
+                    ${_conditionType_} a.govNumImagePath like #{${_conditionParam_}.govNumImagePath}
+                </if>
+                <if test="conditionParamRef.govNumImagePath == null">
+                    ${_conditionType_} a.govNumImagePath is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('govNumImagePathList')">
+                ${_conditionType_} a.govNumImagePath in
+                <foreach collection="conditionParamRef.govNumImagePathList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('titleColorStyle')">
+                <if test="conditionParamRef.titleColorStyle != null and conditionParamRef.titleColorStyle != ''">
+                    ${_conditionType_} a.titleColorStyle like #{${_conditionParam_}.titleColorStyle}
+                </if>
+                <if test="conditionParamRef.titleColorStyle == null">
+                    ${_conditionType_} a.titleColorStyle is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('titleColorStyleList')">
+                ${_conditionType_} a.titleColorStyle in
+                <foreach collection="conditionParamRef.titleColorStyleList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('timeColorStyle')">
+                <if test="conditionParamRef.timeColorStyle != null and conditionParamRef.timeColorStyle != ''">
+                    ${_conditionType_} a.timeColorStyle like #{${_conditionParam_}.timeColorStyle}
+                </if>
+                <if test="conditionParamRef.timeColorStyle == null">
+                    ${_conditionType_} a.timeColorStyle is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('timeColorStyleList')">
+                ${_conditionType_} a.timeColorStyle in
+                <foreach collection="conditionParamRef.timeColorStyleList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('dataTitleColorStyle')">
+                <if test="conditionParamRef.dataTitleColorStyle != null and conditionParamRef.dataTitleColorStyle != ''">
+                    ${_conditionType_} a.dataTitleColorStyle like #{${_conditionParam_}.dataTitleColorStyle}
+                </if>
+                <if test="conditionParamRef.dataTitleColorStyle == null">
+                    ${_conditionType_} a.dataTitleColorStyle is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('dataTitleColorStyleList')">
+                ${_conditionType_} a.dataTitleColorStyle in
+                <foreach collection="conditionParamRef.dataTitleColorStyleList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('dataColorStyle')">
+                <if test="conditionParamRef.dataColorStyle != null and conditionParamRef.dataColorStyle != ''">
+                    ${_conditionType_} a.dataColorStyle like #{${_conditionParam_}.dataColorStyle}
+                </if>
+                <if test="conditionParamRef.dataColorStyle == null">
+                    ${_conditionType_} a.dataColorStyle is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('dataColorStyleList')">
+                ${_conditionType_} a.dataColorStyle in
+                <foreach collection="conditionParamRef.dataColorStyleList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('recordColorStyle')">
+                <if test="conditionParamRef.recordColorStyle != null and conditionParamRef.recordColorStyle != ''">
+                    ${_conditionType_} a.recordColorStyle like #{${_conditionParam_}.recordColorStyle}
+                </if>
+                <if test="conditionParamRef.recordColorStyle == null">
+                    ${_conditionType_} a.recordColorStyle is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('recordColorStyleList')">
+                ${_conditionType_} a.recordColorStyle in
+                <foreach collection="conditionParamRef.recordColorStyleList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('previewImagePath')">
+                <if test="conditionParamRef.previewImagePath != null and conditionParamRef.previewImagePath != ''">
+                    ${_conditionType_} a.previewImagePath like #{${_conditionParam_}.previewImagePath}
+                </if>
+                <if test="conditionParamRef.previewImagePath == null">
+                    ${_conditionType_} a.previewImagePath is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('previewImagePathList')">
+                ${_conditionType_} a.previewImagePath in
+                <foreach collection="conditionParamRef.previewImagePathList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('sortNum')">
+                <if test="conditionParamRef.sortNum != null ">
+                    ${_conditionType_} a.sortNum = #{${_conditionParam_}.sortNum}
+                </if>
+                <if test="conditionParamRef.sortNum == null">
+                    ${_conditionType_} a.sortNum is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('sortNumList')">
+                ${_conditionType_} a.sortNum in
+                <foreach collection="conditionParamRef.sortNumList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('sortNumStart') and conditionParamRef.sortNumStart != null">
+                ${_conditionType_} a.sortNum <![CDATA[ >= ]]> #{${_conditionParam_}.sortNumStart}
+            </if>
+            <if test="conditionParamRef.containsKey('sortNumEnd') and conditionParamRef.sortNumEnd != null">
+                ${_conditionType_} a.sortNum <![CDATA[ <= ]]> #{${_conditionParam_}.sortNumEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('createTime')">
+                <if test="conditionParamRef.createTime != null ">
+                    ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
+                </if>
+                <if test="conditionParamRef.createTime == null">
+                    ${_conditionType_} a.createTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+                ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+                ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createUserId')">
+                <if test="conditionParamRef.createUserId != null ">
+                    ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
+                </if>
+                <if test="conditionParamRef.createUserId == null">
+                    ${_conditionType_} a.createUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList')">
+                ${_conditionType_} a.createUserId in
+                <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
+                ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+                ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('updateTime')">
+                <if test="conditionParamRef.updateTime != null ">
+                    ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
+                </if>
+                <if test="conditionParamRef.updateTime == null">
+                    ${_conditionType_} a.updateTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+    </sql>
+    <sql id="_orderCols_">
+        <if test="orderColList != null and !orderColList.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
+                     ${item.colName} ${item.sortKind}
+                </foreach>
+            </trim>
+        </if>
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                    <if test="orderCol.containsKey('id')">
+                        a.id
+                        <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('categoryId')">
+                        a.categoryId
+                        <if test='orderCol.categoryId != null and "DESC".equalsIgnoreCase(orderCol.categoryId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('deviceType')">
+                        a.deviceType
+                        <if test='orderCol.deviceType != null and "DESC".equalsIgnoreCase(orderCol.deviceType)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('shortName')">
+                        a.shortName
+                        <if test='orderCol.shortName != null and "DESC".equalsIgnoreCase(orderCol.shortName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('imageResolution')">
+                        a.imageResolution
+                        <if test='orderCol.imageResolution != null and "DESC".equalsIgnoreCase(orderCol.imageResolution)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('backgroundImagePath')">
+                        a.backgroundImagePath
+                        <if test='orderCol.backgroundImagePath != null and "DESC".equalsIgnoreCase(orderCol.backgroundImagePath)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('sceneNumImagePath')">
+                        a.sceneNumImagePath
+                        <if test='orderCol.sceneNumImagePath != null and "DESC".equalsIgnoreCase(orderCol.sceneNumImagePath)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('bookingNumImagePath')">
+                        a.bookingNumImagePath
+                        <if test='orderCol.bookingNumImagePath != null and "DESC".equalsIgnoreCase(orderCol.bookingNumImagePath)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('vipNumImagePath')">
+                        a.vipNumImagePath
+                        <if test='orderCol.vipNumImagePath != null and "DESC".equalsIgnoreCase(orderCol.vipNumImagePath)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('smallTicketNumImagePath')">
+                        a.smallTicketNumImagePath
+                        <if test='orderCol.smallTicketNumImagePath != null and "DESC".equalsIgnoreCase(orderCol.smallTicketNumImagePath)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('sceneSignImagePath')">
+                        a.sceneSignImagePath
+                        <if test='orderCol.sceneSignImagePath != null and "DESC".equalsIgnoreCase(orderCol.sceneSignImagePath)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('govNumImagePath')">
+                        a.govNumImagePath
+                        <if test='orderCol.govNumImagePath != null and "DESC".equalsIgnoreCase(orderCol.govNumImagePath)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('titleColorStyle')">
+                        a.titleColorStyle
+                        <if test='orderCol.titleColorStyle != null and "DESC".equalsIgnoreCase(orderCol.titleColorStyle)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('timeColorStyle')">
+                        a.timeColorStyle
+                        <if test='orderCol.timeColorStyle != null and "DESC".equalsIgnoreCase(orderCol.timeColorStyle)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('dataTitleColorStyle')">
+                        a.dataTitleColorStyle
+                        <if test='orderCol.dataTitleColorStyle != null and "DESC".equalsIgnoreCase(orderCol.dataTitleColorStyle)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('dataColorStyle')">
+                        a.dataColorStyle
+                        <if test='orderCol.dataColorStyle != null and "DESC".equalsIgnoreCase(orderCol.dataColorStyle)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('recordColorStyle')">
+                        a.recordColorStyle
+                        <if test='orderCol.recordColorStyle != null and "DESC".equalsIgnoreCase(orderCol.recordColorStyle)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('previewImagePath')">
+                        a.previewImagePath
+                        <if test='orderCol.previewImagePath != null and "DESC".equalsIgnoreCase(orderCol.previewImagePath)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('sortNum')">
+                        a.sortNum
+                        <if test='orderCol.sortNum != null and "DESC".equalsIgnoreCase(orderCol.sortNum)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createTime')">
+                        a.createTime
+                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createUserId')">
+                        a.createUserId
+                        <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateTime')">
+                        a.updateTime
+                        <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+                        ,
+                    </if>
+            </trim>
+        </if>
+    </sql>
+    <sql id="_group_by_">
+        <if test="groupList != null and !groupList.isEmpty()">
+            GROUP BY
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
+                    ${item}
+                </foreach>
+            </trim>
+        </if>
+    </sql>
+</mapper>
\ No newline at end of file

base-manager/src/main/resources/sqlmap/module/skin/SkinCategoryMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.skin.dao.ibatis.SkinCategoryDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="SkinCategoryEntity" id="SkinCategoryEntity-Map">
+            <id  property="id" column="id" />
+            <result property="name" column="name" />
+            <result property="createTime" column="createTime" />
+            <result property="createUserId" column="createUserId" />
+            <result property="updateTime" column="updateTime" />
+            
+    </resultMap>
+
+
+    <!-- 表所有列 -->
+    <sql id="_columns">
+        <trim suffixOverrides="," suffix="">
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
+                    a.id,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))">
+                    a.name,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                    a.createTime,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+                    a.createUserId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+                    a.updateTime,
+                </if>
+        </trim>
+    </sql>
+    <!-- 新增 区分主键自增加还是业务插入 -->
+    <insert id="insert" parameterType="SkinCategoryEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_sys_skin_category
+        (name,createTime,createUserId,updateTime)
+        VALUES
+        (#{name},#{createTime},#{createUserId},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_sys_skin_category
+        (name,createTime,createUserId,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.name},#{item.createTime},#{item.createUserId},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_sys_skin_category as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('name')) or (colPickMode==1 and !data.containsKey('name'))">
+                a.name=#{data.name},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
+                a.createTime=#{data.createTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
+                a.createUserId=#{data.createUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
+                a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
+                a.updateTime=#{data.updateTime},
+            </if>
+        </trim>
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </update>
+    <!-- 批量更新 -->
+    <update id="updateBatch" parameterType="paramDto">
+        update mortals_sys_skin_category as a
+        <trim prefix="set" suffixOverrides=",">
+                <trim prefix="name=(case" suffix="ELSE name end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('name')) or (colPickMode==1 and !item.containsKey('name'))">
+                            when a.id=#{item.id} then #{item.name}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+                            when a.id=#{item.id} then #{item.createTime}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
+                                        when a.id=#{item.id} then #{item.createUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+                            when a.id=#{item.id} then #{item.updateTime}
+                        </if>
+                    </foreach>
+                </trim>
+        </trim>
+        where id in
+        <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </update>
+    <!-- 根据主健查询 -->
+    <select id="getByKey" parameterType="paramDto" resultMap="SkinCategoryEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_skin_category as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_sys_skin_category as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_sys_skin_category where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_sys_skin_category as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="SkinCategoryEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_skin_category as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+        <include refid="_orderCols_"/>
+    </select>
+
+
+
+    <!-- 获取 -->
+    <select id="getListCount" parameterType="paramDto" resultType="int">
+        select count(1)
+        from mortals_sys_skin_category as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </select>
+    <!-- 条件映射 -->
+    <sql id="_condition_">
+        <if test="condition != null and !condition.isEmpty()">
+            <!-- 条件映射-普通条件 -->
+            <include refid="_condition_param_">
+                <property name="_conditionParam_" value="condition"/>
+                <property name="_conditionType_" value="and"/>
+            </include>
+            <!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
+            <if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
+                and
+                <foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
+                    <trim prefixOverrides="or" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="andCondition"/>
+                            <property name="_conditionType_" value="or"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+            <!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
+            <if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
+                and
+                <foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
+                    <trim prefixOverrides="and" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="orCondition"/>
+                            <property name="_conditionType_" value="and"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+        </if>
+    </sql>
+    <!-- 条件映射-代参数 -->
+    <sql id="_condition_param_">
+        <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null">
+                ${_conditionType_} a.id=#{${_conditionParam_}.id}
+            </if>
+        </if>
+            <if test="conditionParamRef.containsKey('id')">
+                <if test="conditionParamRef.id != null ">
+                    ${_conditionType_} a.id = #{${_conditionParam_}.id}
+                </if>
+                <if test="conditionParamRef.id == null">
+                    ${_conditionType_} a.id is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('idList')">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
+                ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+            </if>
+            <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+                ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('name')">
+                <if test="conditionParamRef.name != null and conditionParamRef.name != ''">
+                    ${_conditionType_} a.name like #{${_conditionParam_}.name}
+                </if>
+                <if test="conditionParamRef.name == null">
+                    ${_conditionType_} a.name is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('nameList')">
+                ${_conditionType_} a.name in
+                <foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('createTime')">
+                <if test="conditionParamRef.createTime != null ">
+                    ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
+                </if>
+                <if test="conditionParamRef.createTime == null">
+                    ${_conditionType_} a.createTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+                ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+                ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createUserId')">
+                <if test="conditionParamRef.createUserId != null ">
+                    ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
+                </if>
+                <if test="conditionParamRef.createUserId == null">
+                    ${_conditionType_} a.createUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList')">
+                ${_conditionType_} a.createUserId in
+                <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
+                ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+                ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('updateTime')">
+                <if test="conditionParamRef.updateTime != null ">
+                    ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
+                </if>
+                <if test="conditionParamRef.updateTime == null">
+                    ${_conditionType_} a.updateTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+    </sql>
+    <sql id="_orderCols_">
+        <if test="orderColList != null and !orderColList.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
+                     ${item.colName} ${item.sortKind}
+                </foreach>
+            </trim>
+        </if>
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                    <if test="orderCol.containsKey('id')">
+                        a.id
+                        <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('name')">
+                        a.name
+                        <if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createTime')">
+                        a.createTime
+                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createUserId')">
+                        a.createUserId
+                        <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateTime')">
+                        a.updateTime
+                        <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+                        ,
+                    </if>
+            </trim>
+        </if>
+    </sql>
+    <sql id="_group_by_">
+        <if test="groupList != null and !groupList.isEmpty()">
+            GROUP BY
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
+                    ${item}
+                </foreach>
+            </trim>
+        </if>
+    </sql>
+</mapper>
\ No newline at end of file

base-manager/src/test/java/com/mortals/httpclient/skin/SkinBaseController.http

+
+###系统基础皮肤列表
+POST {{baseUrl}}/skin/base/list
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+    "page":1,
+    "size":10
+}
+
+
+###系统基础皮肤更新与保存
+POST {{baseUrl}}/skin/base/save
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+        "categoryId":342,
+        "deviceType":"phj",
+        "shortName":"yoqk5a",
+        "imageResolution":"0",
+        "backgroundImagePath":"ghmrvv",
+        "sceneNumImagePath":"1977xs",
+        "bookingNumImagePath":"d8nd1m",
+        "vipNumImagePath":"0z6xfe",
+        "smallTicketNumImagePath":"k7er3k",
+        "sceneSignImagePath":"pb4s89",
+        "govNumImagePath":"fk4qjn",
+        "titleColorStyle":"7x2uby",
+        "timeColorStyle":"qqj9om",
+        "dataTitleColorStyle":"t1v89j",
+        "dataColorStyle":"arbo9i",
+        "recordColorStyle":"9ukimo",
+        "previewImagePath":"ais7r0",
+        "sortNum":832,
+}
+
+> {%
+client.global.set("SkinBase_id", JSON.parse(response.body).data.id);
+%}
+
+###系统基础皮肤查看
+GET {{baseUrl}}/skin/base/info?id={{SkinBase_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+###系统基础皮肤编辑
+GET {{baseUrl}}/skin/base/edit?id={{SkinBase_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+
+###系统基础皮肤删除
+GET {{baseUrl}}/skin/base/delete?id={{SkinBase_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+
+
+

base-manager/src/test/java/com/mortals/httpclient/skin/SkinCategoryController.http

+
+###系统皮肤分类列表
+POST {{baseUrl}}/skin/category/list
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+    "page":1,
+    "size":10
+}
+
+
+###系统皮肤分类更新与保存
+POST {{baseUrl}}/skin/category/save
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+        "name":"m4abmg",
+}
+
+> {%
+client.global.set("SkinCategory_id", JSON.parse(response.body).data.id);
+%}
+
+###系统皮肤分类查看
+GET {{baseUrl}}/skin/category/info?id={{SkinCategory_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+###系统皮肤分类编辑
+GET {{baseUrl}}/skin/category/edit?id={{SkinCategory_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+
+###系统皮肤分类删除
+GET {{baseUrl}}/skin/category/delete?id={{SkinCategory_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+
+
+

db/base_modules.sql

@@ -592,3 +592,47 @@ CREATE TABLE `mortals_sys_holiday` (
 ) ENGINE = InnoDB  CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '节假日表' ROW_FORMAT = Dynamic;
 
 
+
+
+-- ----------------------------
+-- 系统皮肤分类表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_sys_skin_category`;
+CREATE TABLE mortals_sys_skin_category(
+    `id` bigint(20)   AUTO_INCREMENT  COMMENT '序号，主键，自增长',
+    `name` varchar(64)     COMMENT '分类名称',
+    `createTime` datetime     COMMENT '创建时间',
+    `createUserId` bigint(20)     COMMENT '创建用户',
+    `updateTime` datetime     COMMENT '修改时间',
+PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='系统皮肤分类';
+-- ----------------------------
+-- 系统基础皮肤表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_sys_skin_base`;
+CREATE TABLE mortals_sys_skin_base(
+    `id` bigint(20)   AUTO_INCREMENT  COMMENT '序号，主键，自增长',
+    `categoryId` bigint(20)     COMMENT '所属种类,来源种类',
+    `deviceType` varchar(64)     COMMENT '设备类型  (pdj.排队机，ckp.窗口屏，hjq.呼叫器，jzxsp.集中显示屏，dsj.导视机，pjq.评级器，zzfwzd.自助服务终端，tdj.填单机，ybj.样表机)',
+    `shortName` varchar(64)     COMMENT '皮肤名称',
+    `imageResolution` varchar(64)     COMMENT '分辨率 (1.1920*1080，2.1080*1920，3.1280*1280)',
+    `backgroundImagePath` varchar(256)     COMMENT '背景大图',
+    `sceneNumImagePath` varchar(256)     COMMENT '现场取号图片',
+    `bookingNumImagePath` varchar(256)     COMMENT '预约取号图片',
+    `vipNumImagePath` varchar(256)     COMMENT 'vip取号图片',
+    `smallTicketNumImagePath` varchar(256)     COMMENT '重打小票图片',
+    `sceneSignImagePath` varchar(256)     COMMENT '现场签到图片',
+    `govNumImagePath` varchar(256)     COMMENT '政务网取号图片',
+    `titleColorStyle` varchar(256)     COMMENT '标题颜色',
+    `timeColorStyle` varchar(256)     COMMENT '时间颜色',
+    `dataTitleColorStyle` varchar(256)     COMMENT '数据标题颜色',
+    `dataColorStyle` varchar(256)     COMMENT '数据颜色',
+    `recordColorStyle` varchar(256)     COMMENT '备案颜色',
+    `previewImagePath` varchar(256)     COMMENT '预览图片',
+    `sortNum` int(9)     COMMENT '排序编号',
+    `createTime` datetime     COMMENT '创建时间',
+    `createUserId` bigint(20)     COMMENT '创建用户',
+    `updateTime` datetime     COMMENT '修改时间',
+PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='系统基础皮肤';
+

db/params.sql

@@ -319,3 +319,18 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '区域状态', 'Area', 'status',
 
 
 
+-- ----------------------------
+-- 系统基础皮肤参数 SQL
+-- ----------------------------
+INSERT INTO `mortals_xhx_param` VALUES (null, '设备类型  ', 'SkinBase', 'deviceType', 'pdj', '排队机', 1, 4, 0, 'deviceType', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '设备类型  ', 'SkinBase', 'deviceType', 'ckp', '窗口屏', 1, 4, 0, 'deviceType', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '设备类型  ', 'SkinBase', 'deviceType', 'hjq', '呼叫器', 1, 4, 0, 'deviceType', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '设备类型  ', 'SkinBase', 'deviceType', 'jzxsp', '集中显示屏', 1, 4, 0, 'deviceType', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '设备类型  ', 'SkinBase', 'deviceType', 'dsj', '导视机', 1, 4, 0, 'deviceType', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '设备类型  ', 'SkinBase', 'deviceType', 'pjq', '评级器', 1, 4, 0, 'deviceType', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '设备类型  ', 'SkinBase', 'deviceType', 'zzfwzd', '自助服务终端', 1, 4, 0, 'deviceType', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '设备类型  ', 'SkinBase', 'deviceType', 'tdj', '填单机', 1, 4, 0, 'deviceType', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '设备类型  ', 'SkinBase', 'deviceType', 'ybj', '样表机', 1, 4, 0, 'deviceType', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '分辨率 ', 'SkinBase', 'imageResolution', '1', '1920*1080', 1, 4, 0, 'imageResolution', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '分辨率 ', 'SkinBase', 'imageResolution', '2', '1080*1920', 1, 4, 0, 'imageResolution', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '分辨率 ', 'SkinBase', 'imageResolution', '3', '1280*1280', 1, 4, 0, 'imageResolution', NULL, NULL, NULL);
\ No newline at end of file

doc/api.md

@@ -7664,9 +7664,7 @@ id|Long|主键,唯一|是|-
 
 **请求样例:**
 ```
-
     http://localhost/window/matter/edit?id=549
-
 ```
 **响应参数:**
 
@@ -8887,6 +8885,541 @@ code|Integer|结果码（-1.失败，1.成功）|-
 msg|String|消息|-
 
 
+**响应消息样例:**
+```
+
+{
+    "code":1,
+	"msg":"成功"
+
+}
+
+```
+
+## 系统皮肤分类
+
+### 查询系统皮肤分类列表
+
+**请求URL:** skin/category/list
+
+**请求方式:** POST
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 查询系统皮肤分类
+
+**请求参数:**
+
+参数名称|类型|备注|必填|其它
+---|---|---|---|---
+page|Integer|当前页|否|-
+size|Integer|每页条数|否|-1查询所有
+name|String|分类名称|否|前后添加%%，可模糊查询
+
+**请求样例:**
+```
+
+  {
+        "page":1,
+        "size":10
+  }
+
+```
+**响应参数:**
+
+参数名称 |参数类型|备注|其它
+---|---|---|---
+code|Integer|结果码（-1.失败，1.成功）|-
+msg|String|消息|-
+data|object|数据对象|-
+ per_page|Integer|每页条数|-
+ total|Integer|总条数|-
+ last_page|Integer|总页数|-
+ current_page|Integer|当前页|-
+ data|array|结果集列表|数组
+  id|Long|序号|-
+  name|String|分类名称|-
+  createTime|Date|创建时间|-
+  createUserId|Long|创建用户|-
+  updateTime|Date|修改时间|-
+dict|object|字典对象|-
+
+
+**响应消息样例:**
+```
+{
+    "code":1,
+    "data":{
+        "per_page":10,
+        "total":0,
+        "data":[],
+        "last_page":0,
+        "current_page":1
+    },
+}
+```
+
+### 查看系统皮肤分类
+
+**请求URL:** skin/category/info
+
+**请求方式:** GET
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 查看系统皮肤分类，返回实例详细信息
+
+**请求参数:**
+
+参数名称|类型|备注|必填|其它
+---|---|---|---|---
+id|Long|主键,唯一|是|-
+
+**请求样例:**
+```
+    http://localhost/skin/category/info?id=549
+
+```
+**响应参数:**
+
+参数名称 |参数类型|备注|其它
+---|---|---|---
+code|Integer|结果码（-1.失败，1.成功）|-
+msg|String|消息|-
+data|object|数据对象|-
+ id|Long|序号，主键，自增长|-
+ name|String|分类名称|-
+ createTime|Date|创建时间|-
+ createUserId|Long|创建用户|-
+ updateTime|Date|修改时间|-
+dict|object|字典对象|-
+
+
+**响应消息样例:**
+```
+{
+    "code": 1,
+    "data": {
+            "id":1679,
+            "name":"fn013b",
+            "createTime":"2022-05-16",
+            "createUserId":7162,
+            "updateTime":"2022-05-16"
+        }
+}
+```
+
+### 保存更新系统皮肤分类
+
+**请求URL:** skin/category/save
+
+**请求方式:** POST
+
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 保存或更新系统皮肤分类：id为空时为新增保存，否则为更新提交
+
+**请求参数:**
+
+参数名称|类型|备注|必填|其它
+---|---|---|---|---
+name|String|分类名称|是|-
+
+**请求样例:**
+```
+
+{
+    "name":"lo9vw0",
+}
+
+```
+**响应参数:**
+
+参数名称 |参数类型|备注|其它
+---|---|---|---
+code|Integer|结果码（-1.失败，1.成功）|-
+msg|String|消息|-
+data|object|数据对象|-
+ id|Long|保存后主键id|-
+ entity|object|保存更新实体|对象
+  id|Long|序号，主键，自增长|-
+  name|String|分类名称|-
+  createTime|Date|创建时间|-
+  createUserId|Long|创建用户|-
+  updateTime|Date|修改时间|-
+
+**响应消息样例:**
+```
+
+{
+    "msg":"新增模块成功",
+    "code":1,
+    "data":{
+            "__mortals_form_state__":"ADD",
+            "id":4,
+            "entity":{
+                "createTime":1642486776780,
+                "id":4,
+                "modelCode":"phxt1",
+                "modelName":"排号系统4",
+                "updateTime":1642486776780
+            }
+    }
+}
+
+```
+
+
+### 删除系统皮肤分类
+
+**请求URL:** skin/category/delete
+
+**请求方式:** POST
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 删除系统皮肤分类
+
+**请求参数:**
+
+参数名称|类型|备注|必填|其它
+---|---|---|---|---
+id|String|字符串，多个逗号分隔|是|-
+
+**请求样例:**
+```
+    http://localhost:8080/skin/category/delete?id=1'
+
+```
+**响应参数:**
+
+参数名称 |参数类型|备注|其它
+---|---|---|---
+code|Integer|结果码（-1.失败，1.成功）|-
+msg|String|消息|-
+
+
+**响应消息样例:**
+```
+
+{
+    "code":1,
+	"msg":"成功"
+
+}
+
+```
+
+
+
+## 皮肤基本属性
+
+### 查询系统基础皮肤列表
+
+**请求URL:** skin/base/list
+
+**请求方式:** POST
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 查询系统基础皮肤
+
+**请求参数:**
+
+参数名称|类型|备注|必填|其它
+---|---|---|---|---
+page|Integer|当前页|否|-
+size|Integer|每页条数|否|-1查询所有
+deviceType|String|设备类型编码|否|设备编码字段，如phj
+categoryId|Long|所属种类,来源种类|否|归属种类
+
+**请求样例:**
+```
+
+  {
+        "page":1,
+        "size":10
+  }
+
+```
+**响应参数:**
+
+参数名称 |参数类型|备注|其它
+---|---|---|---
+code|Integer|结果码（-1.失败，1.成功）|-
+msg|String|消息|-
+data|object|数据对象|-
+ per_page|Integer|每页条数|-
+ total|Integer|总条数|-
+ last_page|Integer|总页数|-
+ current_page|Integer|当前页|-
+ data|array|结果集列表|数组
+  id|Long|序号，主键，自增长|-
+  categoryId|Long|所属种类,来源种类|-
+  deviceType|String|设备类型  (pdj.排队机，ckp.窗口屏，hjq.呼叫器，jzxsp.集中显示屏，dsj.导视机，pjq.评级器，zzfwzd.自助服务终端，tdj.填单机，ybj.样表机)|-
+  shortName|String|皮肤名称|-
+  imageResolution|String|分辨率 (1.1920*1080，2.1080*1920，3.1280*1280)|-
+  backgroundImagePath|String|背景大图|-
+  sceneNumImagePath|String|现场取号图片|-
+  bookingNumImagePath|String|预约取号图片|-
+  vipNumImagePath|String|vip取号图片|-
+  smallTicketNumImagePath|String|重打小票图片|-
+  sceneSignImagePath|String|现场签到图片|-
+  govNumImagePath|String|政务网取号图片|-
+  titleColorStyle|String|标题颜色|-
+  timeColorStyle|String|时间颜色|-
+  dataTitleColorStyle|String|数据标题颜色|-
+  dataColorStyle|String|数据颜色|-
+  recordColorStyle|String|备案颜色|-
+  previewImagePath|String|预览图片|-
+  sortNum|Integer|排序编号|-
+  createTime|Date|创建时间|-
+  createUserId|Long|创建用户|-
+  updateTime|Date|修改时间|-
+dict|object|字典对象|-
+ deviceType|object|字典属性对象，详见附录|-
+ imageResolution|object|字典属性对象，详见附录|-
+
+
+**响应消息样例:**
+```
+{
+    "code":1,
+    "data":{
+    },
+
+}
+```
+
+### 查看系统基础皮肤
+
+**请求URL:** skin/base/info
+
+**请求方式:** GET
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 查看系统基础皮肤，返回实例详细信息
+
+**请求参数:**
+
+参数名称|类型|备注|必填|其它
+---|---|---|---|---
+id|Long|主键,唯一|是|-
+
+**请求样例:**
+```
+    http://localhost/skin/base/info?id=549
+```
+**响应参数:**
+
+参数名称 |参数类型|备注|其它
+---|---|---|---
+code|Integer|结果码（-1.失败，1.成功）|-
+msg|String|消息|-
+data|object|数据对象|-
+ id|Long|序号，主键，自增长|-
+ categoryId|Long|所属种类,来源种类|-
+ deviceType|String|设备类型  (pdj.排队机，ckp.窗口屏，hjq.呼叫器，jzxsp.集中显示屏，dsj.导视机，pjq.评级器，zzfwzd.自助服务终端，tdj.填单机，ybj.样表机)|-
+ shortName|String|皮肤名称|-
+ imageResolution|String|分辨率 (1.1920*1080，2.1080*1920，3.1280*1280)|-
+ backgroundImagePath|String|背景大图|-
+ sceneNumImagePath|String|现场取号图片|-
+ bookingNumImagePath|String|预约取号图片|-
+ vipNumImagePath|String|vip取号图片|-
+ smallTicketNumImagePath|String|重打小票图片|-
+ sceneSignImagePath|String|现场签到图片|-
+ govNumImagePath|String|政务网取号图片|-
+ titleColorStyle|String|标题颜色|-
+ timeColorStyle|String|时间颜色|-
+ dataTitleColorStyle|String|数据标题颜色|-
+ dataColorStyle|String|数据颜色|-
+ recordColorStyle|String|备案颜色|-
+ previewImagePath|String|预览图片|-
+ sortNum|Integer|排序编号|-
+ createTime|Date|创建时间|-
+ createUserId|Long|创建用户|-
+ updateTime|Date|修改时间|-
+dict|object|字典对象|-
+ deviceType|object|字典属性对象，详见附录|-
+ imageResolution|object|字典属性对象，详见附录|-
+
+
+**响应消息样例:**
+```
+{
+    "code": 1,
+    "data": {
+            "id":2219,
+            "categoryId":1767,
+            "deviceType":"im2be1",
+            "shortName":"uvlpbq",
+            "imageResolution":"5wlrc0",
+            "backgroundImagePath":"bva76t",
+            "sceneNumImagePath":"iv1vuk",
+            "bookingNumImagePath":"qrmos8",
+            "vipNumImagePath":"41r7p6",
+            "smallTicketNumImagePath":"i2r8jz",
+            "sceneSignImagePath":"attqxn",
+            "govNumImagePath":"5a5pp2",
+            "titleColorStyle":"n9p5dp",
+            "timeColorStyle":"r1cay4",
+            "dataTitleColorStyle":"l3ep0g",
+            "dataColorStyle":"a64k6d",
+            "recordColorStyle":"dg9qwj",
+            "previewImagePath":"f7g2hk",
+            "sortNum":4841,
+            "createTime":"2022-05-16",
+            "createUserId":7465,
+            "updateTime":"2022-05-16"
+        }
+}
+```
+
+### 保存更新系统基础皮肤
+
+**请求URL:** skin/base/save
+
+**请求方式:** POST
+
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 保存或更新系统基础皮肤：id为空时为新增保存，否则为更新提交
+
+**请求参数:**
+
+参数名称|类型|备注|必填|其它
+---|---|---|---|---
+categoryId|Long|所属种类,来源种类|是|-
+deviceType|String|设备类型  (pdj.排队机，ckp.窗口屏，hjq.呼叫器，jzxsp.集中显示屏，dsj.导视机，pjq.评级器，zzfwzd.自助服务终端，tdj.填单机，ybj.样表机)|是|-
+shortName|String|皮肤名称|是|-
+imageResolution|String|分辨率 (1.1920*1080，2.1080*1920，3.1280*1280)|是|-
+backgroundImagePath|String|背景大图|是|-
+sceneNumImagePath|String|现场取号图片|是|-
+bookingNumImagePath|String|预约取号图片|是|-
+vipNumImagePath|String|vip取号图片|是|-
+smallTicketNumImagePath|String|重打小票图片|是|-
+sceneSignImagePath|String|现场签到图片|是|-
+govNumImagePath|String|政务网取号图片|是|-
+titleColorStyle|String|标题颜色|是|-
+timeColorStyle|String|时间颜色|是|-
+dataTitleColorStyle|String|数据标题颜色|是|-
+dataColorStyle|String|数据颜色|是|-
+recordColorStyle|String|备案颜色|是|-
+previewImagePath|String|预览图片|是|-
+sortNum|Integer|排序编号|是|-
+
+**请求样例:**
+```
+
+{
+    "categoryId":3258,
+    "deviceType":"zvtxgz",
+    "shortName":"r8mosa",
+    "imageResolution":"bycfey",
+    "backgroundImagePath":"f87tmp",
+    "sceneNumImagePath":"y5j2ld",
+    "bookingNumImagePath":"cvshxf",
+    "vipNumImagePath":"qixahy",
+    "smallTicketNumImagePath":"w0ixn7",
+    "sceneSignImagePath":"p5aixv",
+    "govNumImagePath":"emuez3",
+    "titleColorStyle":"5dlse8",
+    "timeColorStyle":"thoqm9",
+    "dataTitleColorStyle":"518dtc",
+    "dataColorStyle":"cv24nr",
+    "recordColorStyle":"711op3",
+    "previewImagePath":"9nkzlb",
+    "sortNum":7583,
+}
+
+```
+**响应参数:**
+
+参数名称 |参数类型|备注|其它
+---|---|---|---
+code|Integer|结果码（-1.失败，1.成功）|-
+msg|String|消息|-
+data|object|数据对象|-
+ id|Long|保存后主键id|-
+ entity|object|保存更新实体|对象
+  id|Long|序号，主键，自增长|-
+  categoryId|Long|所属种类,来源种类|-
+  deviceType|String|设备类型  (pdj.排队机，ckp.窗口屏，hjq.呼叫器，jzxsp.集中显示屏，dsj.导视机，pjq.评级器，zzfwzd.自助服务终端，tdj.填单机，ybj.样表机)|-
+  shortName|String|皮肤名称|-
+  imageResolution|String|分辨率 (1.1920*1080，2.1080*1920，3.1280*1280)|-
+  backgroundImagePath|String|背景大图|-
+  sceneNumImagePath|String|现场取号图片|-
+  bookingNumImagePath|String|预约取号图片|-
+  vipNumImagePath|String|vip取号图片|-
+  smallTicketNumImagePath|String|重打小票图片|-
+  sceneSignImagePath|String|现场签到图片|-
+  govNumImagePath|String|政务网取号图片|-
+  titleColorStyle|String|标题颜色|-
+  timeColorStyle|String|时间颜色|-
+  dataTitleColorStyle|String|数据标题颜色|-
+  dataColorStyle|String|数据颜色|-
+  recordColorStyle|String|备案颜色|-
+  previewImagePath|String|预览图片|-
+  sortNum|Integer|排序编号|-
+  createTime|Date|创建时间|-
+  createUserId|Long|创建用户|-
+  updateTime|Date|修改时间|-
+
+**响应消息样例:**
+```
+
+{
+    "msg":"新增模块成功",
+    "code":1,
+    "data":{
+            "__mortals_form_state__":"ADD",
+            "id":4,
+            "entity":{
+                "createTime":1642486776780,
+                "id":4,
+                "modelCode":"phxt1",
+                "modelName":"排号系统4",
+                "updateTime":1642486776780
+            }
+    }
+}
+
+```
+
+
+### 删除系统基础皮肤
+
+**请求URL:** skin/base/delete
+
+**请求方式:** POST
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 删除系统基础皮肤
+
+**请求参数:**
+
+参数名称|类型|备注|必填|其它
+---|---|---|---|---
+id|String|字符串，多个逗号分隔|是|-
+
+**请求样例:**
+```
+
+    http://localhost:8080/skin/base/delete?id=1'
+
+```
+**响应参数:**
+
+参数名称 |参数类型|备注|其它
+---|---|---|---
+code|Integer|结果码（-1.失败，1.成功）|-
+msg|String|消息|-
+
+
 **响应消息样例:**
 ```
 
@@ -8931,12 +9464,6 @@ msg|String|消息|-
 0|停用|-
 1|正常|-
 
-
-
-
-
-
-
 ### isAutotable
 字典参数key|字典参数值|其它
 ---|---|---
@@ -8980,41 +9507,18 @@ msg|String|消息|-
 1|是|-
 
 
-
-
-
-
-
-
-
-
-
-
-
 ### source
 字典参数key|字典参数值|其它
 ---|---|---
 0|政务网|-
 1|自定义|-
 
-
-
-
-
-
-
 ### source
 字典参数key|字典参数值|其它
 ---|---|---
 0|政务网|-
 1|自定义|-
 
-
-
-
-
-
-
 ### filetype
 字典参数key|字典参数值|其它
 ---|---|---
@@ -9051,24 +9555,12 @@ msg|String|消息|-
 0|政务网|-
 1|自定义|-
 
-
-
-
-
-
-
 ### source
 字典参数key|字典参数值|其它
 ---|---|---
 0|政务网|-
 1|自定义|-
 
-
-
-
-
-
-
 ### policyType
 字典参数key|字典参数值|其它
 ---|---|---
@@ -9086,24 +9578,6 @@ msg|String|消息|-
 0|政务网|-
 1|自定义|-
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 ### messageoff
 字典参数key|字典参数值|其它
 ---|---|---
@@ -9117,12 +9591,6 @@ msg|String|消息|-
 2|阿里云|-
 3|移动|-
 
-
-
-
-
-
-
 ### type
 字典参数key|字典参数值|其它
 ---|---|---
@@ -9130,12 +9598,6 @@ msg|String|消息|-
 2|取号成功短信|-
 3|临近叫号短信|-
 
-
-
-
-
-
-
 ### online
 字典参数key|字典参数值|其它
 ---|---|---
@@ -9146,12 +9608,6 @@ msg|String|消息|-
 4|回归|-
 5|登陆|-
 
-
-
-
-
-
-
 ### haveSonArea
 字典参数key|字典参数值|其它
 ---|---|---
@@ -9212,24 +9668,12 @@ msg|String|消息|-
 0|停用|-
 1|正常|-
 
-
-
-
-
-
-
 ### hongqi
 字典参数key|字典参数值|其它
 ---|---|---
 1|是|-
 0|否|-
 
-
-
-
-
-
-
 ### haveSonArea
 字典参数key|字典参数值|其它
 ---|---|---
@@ -9269,12 +9713,6 @@ false|否|-
 0|停用|-
 1|正常|-
 
-
-
-
-
-
-
 ### isMust
 字典参数key|字典参数值|其它
 ---|---|---
@@ -9335,18 +9773,6 @@ pdf|jpg|pdf|jpg|-
 0|政务网|-
 1|自定义|-
 
-
-
-
-
-
-
-
-
-
-
-
-
 ### isBusiness
 字典参数key|字典参数值|其它
 ---|---|---
@@ -9359,36 +9785,12 @@ pdf|jpg|pdf|jpg|-
 0|停用|-
 1|正常|-
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 ### isShow
 字典参数key|字典参数值|其它
 ---|---|---
 1|是|-
 0|否|-
 
-
-
-
-
-
-
 ### appoveObjectShow
 字典参数key|字典参数值|其它
 ---|---|---
@@ -9582,7 +9984,25 @@ pdf|jpg|pdf|jpg|-
 1|自定义|-
 
 
-
+### deviceType
+字典参数key|字典参数值|其它
+---|---|---
+pdj|排队机|-
+ckp|窗口屏|-
+hjq|呼叫器|-
+jzxsp|集中显示屏|-
+dsj|导视机|-
+pjq|评级器|-
+zzfwzd|自助服务终端|-
+tdj|填单机|-
+ybj|样表机|-
+
+### imageResolution
+字典参数key|字典参数值|其它
+---|---|---
+1|1920*1080|-
+2|1080*1920|-
+3|1280*1280|-