diff --git a/mallinkAdmin/src/main/resources/db/migration/V202101280001__wx_miniapp_theme.sql b/mallinkAdmin/src/main/resources/db/migration/V202101280001__wx_miniapp_theme.sql
new file mode 100644
index 000000000..d04165b29
--- /dev/null
+++ b/mallinkAdmin/src/main/resources/db/migration/V202101280001__wx_miniapp_theme.sql
@@ -0,0 +1,17 @@
+update wx_miniapp_theme_deploy set default_icon = ''https://formall.oss-accelerate.aliyuncs.com/cimg/new_kanjia.png'' where id = 4444;
+update wx_miniapp_theme_deploy set default_icon = ''https://formall.oss-accelerate.aliyuncs.com/cimg/new_pintuan.png'' where id = 4455;
+update wx_miniapp_theme_deploy set default_icon = ''https://formall.oss-accelerate.aliyuncs.com/cimg/zhibo.png'' where id = 4466;
+update wx_miniapp_theme_deploy set default_icon = ''https://formall.oss-accelerate.aliyuncs.com/cimg/new_xiaofeika.png'' where id = 4477;
+update wx_miniapp_theme_deploy set default_icon = ''https://formall.oss-accelerate.aliyuncs.com/cimg/jifen.png'' where id = 4488;
+
+INSERT INTO `wx_miniapp_theme_deploy`(`id`, `name`, `remarks`, `theme_type`, `default_icon`, `default_style`) VALUES (4499, ''sy_qd'', ''首页签到图标'', 2, ''https://formall.oss-accelerate.aliyuncs.com/cimg/qiandao.png'', NULL);
+INSERT INTO `wx_miniapp_theme_deploy`(`id`, `name`, `remarks`, `theme_type`, `default_icon`, `default_style`) VALUES (5500, ''sy_hd'', ''首页活动图标'', 2, ''https://formall.oss-accelerate.aliyuncs.com/cimg/huodong.png'', NULL);
+INSERT INTO `wx_miniapp_theme_deploy`(`id`, `name`, `remarks`, `theme_type`, `default_icon`, `default_style`) VALUES (5511, ''sy_yx'', ''首页游戏图标'', 2, ''https://formall.oss-accelerate.aliyuncs.com/cimg/youxi.png'', NULL);
+
+INSERT INTO `wx_miniapp_theme_value`(`id`, `miniapp_theme_id`, `miniapp_deploy_id`, `icon`, `style_class`) VALUES (1010, 2, 4499, NULL, NULL);
+INSERT INTO `wx_miniapp_theme_value`(`id`, `miniapp_theme_id`, `miniapp_deploy_id`, `icon`, `style_class`) VALUES (1020, 2, 5500, NULL, NULL);
+INSERT INTO `wx_miniapp_theme_value`(`id`, `miniapp_theme_id`, `miniapp_deploy_id`, `icon`, `style_class`) VALUES (1030, 2, 5511, NULL, NULL);
+
+INSERT INTO `wx_miniapp_theme_value`(`id`, `miniapp_theme_id`, `miniapp_deploy_id`, `icon`, `style_class`) VALUES (3010, 3, 4499, NULL, NULL);
+INSERT INTO `wx_miniapp_theme_value`(`id`, `miniapp_theme_id`, `miniapp_deploy_id`, `icon`, `style_class`) VALUES (3020, 3, 5500, NULL, NULL);
+INSERT INTO `wx_miniapp_theme_value`(`id`, `miniapp_theme_id`, `miniapp_deploy_id`, `icon`, `style_class`) VALUES (3030, 3, 5511, NULL, NULL);
diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java
index fb2c4e929..3de1356da 100644
--- a/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java
+++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java
@@ -1,18 +1,14 @@
package com.iformall.controller;
-import com.github.pagehelper.PageInfo;
import com.iformall.annotation.RedisCache;
import com.iformall.annotation.TenantIgnore;
import com.iformall.common.ErrorCode;
-import com.iformall.common.Result;
import com.iformall.common.ResultData;
-import com.iformall.domain.po.WxMiniappTheme;
import com.iformall.domain.po.WxMiniappThemeValue;
import com.iformall.domain.po.WxThemeMall;
import com.iformall.enums.EnumThemeType;
import com.iformall.service.WxMiniappThemeService;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/mallinkService/src/main/resources/mapper/WxActivityMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityMapper.xml
index 3835011a3..536a81bb6 100644
--- a/mallinkService/src/main/resources/mapper/WxActivityMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxActivityMapper.xml
@@ -94,8 +94,10 @@
- and ((`activity_start_time` >= #{startDate} and `activity_start_time` <= #{endDate})
- or (`activity_end_time` >= #{startDate} and `activity_end_time` <= #{endDate}))
+ and not(`activity_end_time` < #{startDate} or `activity_start_time` > #{endDate})
+ /*and ((`activity_start_time` >= #{startDate} and `activity_start_time` <= #{endDate})
+ or (`activity_end_time` >= #{startDate} and `activity_end_time` <= #{endDate})
+ or (`activity_start_time` <= #{startDate} and `activity_end_time` >= #{endDate}))*/