Merge branch 'dev_notic_bug_syc' into dev_temp

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java

@@ -779,6 +779,15 @@ public class CodeServiceImpl implements CodeService {
 			dto.setCreateTime(DateUtils.formatTimestamp(temp.getCreateTime(), DateUtils.DATE_TIME_PATTERN));
 			resultList.add(dto);
 		});
+		//按时间降序
+		if (resultList.size() > NumConstant.ZERO) {
+			Collections.sort(resultList, new Comparator<TemplateDraftListResultDTO>() {
+				@Override
+				public int compare(TemplateDraftListResultDTO o1, TemplateDraftListResultDTO o2) {
+					return o2.getCreateTime().compareTo(o1.getCreateTime());
+				}
+			});
+		}
 		return resultList;
 	}
 

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxLoginServiceImpl.java

@@ -41,7 +41,7 @@ public class WxLoginServiceImpl implements WxLoginService {
 	@Override
 	public UserWechatDTO resiAndWorkLogin(String appId, String wxCode, String customerId, String clientType) {
 		//1.获取用户openid和session_key
-		logger.info(String.format("wxcode获取微信用户信息，接口入参appId：%s;wxCode：%s;customerId：%s;clientType：%s"), appId, wxCode, customerId, clientType);
+		logger.info(String.format("wxcode获取微信用户信息，接口入参appId：[%s];wxCode：[%s];customerId：[%s];clientType：[%s]", appId, wxCode, customerId, clientType));
 		Map<String, Object> map = new HashMap<>();
 		map.put("appid", appId);
 		map.put("js_code", wxCode);