Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-07 2a4dc73c59eae1e14b0e0660bf04652fa3d322ad

 zq-erp/src/main/java/com/matrix/system/wechart/templateMsg/Task/messageBulderDemo/DefaultTemplateMessageBulder.java

@@ -1,8 +1,8 @@
package com.matrix.system.wechart.templateMsg.Task.messageBulderDemo;

import com.alibaba.fastjson.JSONObject;
import com.matrix.biz.bean.BizUser;
import com.matrix.biz.dao.BizUserDao;
import com.matrix.system.hive.bean.SysVipInfo;
import com.matrix.system.hive.dao.SysVipInfoDao;
import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.StringUtils;
import com.matrix.system.hive.bean.SysBeauticianState;