Merge branch 'master' into 5.6-global

@@ -163,6 +163,19 @@ public class RobotQuestionServiceImpl extends BaseService implements IRobotQuest
         Map<String, Object> productMap = new LinkedHashMap<>();
         Map<String, Object> productMap = new LinkedHashMap<>();
         productMap.put("question", map.get("question") == null ? "" : map.get("question"));
         productMap.put("question", map.get("question") == null ? "" : map.get("question"));
         productMap.put("answer", map.get("answer") == null ? "" : map.get("answer"));
         productMap.put("answer", map.get("answer") == null ? "" : map.get("answer"));
+        productMap.put("clickTimes", map.get("clickTimes") == null ? "" : map.get("clickTimes"));
+        productMap.put("createTime", map.get("createTime") == null ? "" : map.get("createTime"));
+        productMap.put("effectTime", map.get("effectTime") == null ? "" : map.get("effectTime"));
+        productMap.put("id", map.get("id") == null ? "" : map.get("id"));
+        productMap.put("isDisable", map.get("isDisable") == null ? "" : map.get("isDisable"));
+        productMap.put("keywords", map.get("keywords") == null ? "" : map.get("keywords"));
+        productMap.put("maxSortId", map.get("maxSortId") == null ? "" : map.get("maxSortId"));
+        productMap.put("middleSortId", map.get("middleSortId") == null ? "" : map.get("middleSortId"));
+        productMap.put("pid", map.get("pid") == null ? "" : map.get("pid"));
+        productMap.put("questionSeq", map.get("questionSeq") == null ? "" : map.get("questionSeq"));
+        productMap.put("smallSortId", map.get("smallSortId") == null ? "" : map.get("smallSortId"));
+        productMap.put("updatePid", map.get("updatePid") == null ? "" : map.get("updatePid"));
+        productMap.put("updateTime", map.get("updateTime") == null ? "" : map.get("updateTime"));
         return productMap;
         return productMap;
     }
     }
 }
 }