Merge branch 'prod' of http://git.zonelife.cn:3000/IT/SpringBatchService

# Conflicts:
#	SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/impl/XiaoJuServiceImpl.java

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/impl/XiaoJuServiceImpl.java

@@ -691,6 +691,13 @@ public class XiaoJuServiceImpl implements XiaoJuService {
             xiaoJuActivityReceiverDao.save(xiaoJuActivityReceiver);
             apiLog.setResponse(JSONUtil.toJsonStr(response));
             apiLogDao.save(apiLog);
+            List<QueryGetPromotionResponse> list = new ArrayList<>();
+
+            for (Object genPromotionInfo : response) {
+                JSONObject entries = JSONUtil.parseObj(genPromotionInfo);
+                QueryGetPromotionResponse bean = entries.toBean(QueryGetPromotionResponse.class);
+                list.add(bean);
+            }
             List<QueryGetPromotionResponse> list=new ArrayList<>();
             for (GenPromotionInfo genPromotionInfo : response) {
                 JSONObject entries = JSONUtil.parseObj(genPromotionInfo);