Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/sundata/internalevaluation/conf/JsonToCalciteExample.java

src/main/java/com/sundata/product/rfEngine/PublicComponent/ProjectTeam/ProjectTeamComponent.java

@@ -16,7 +16,7 @@ public class ProjectTeamComponent {
     public  Map<String,Object> doJavaLogic(Map<String, Object> inputmap) throws Exception {
 
         CalcUtil.calcRules("","rules1001",inputmap);
-        String jsonDate="";
+        /*String jsonDate="";
         try {
             ObjectMapper objectMapper = new ObjectMapper().enable(SerializationFeature.INDENT_OUTPUT);
             Map<String, Object> map = new HashMap<>();
@@ -41,12 +41,14 @@ public class ProjectTeamComponent {
         {"input":[{"custNo":"890629176414044160","method":"asyncRegularExecute"}]}
         """;
         String schemaName="test";
-        jsontable.jsonTotable(schemaName,jsonDate,"");
+        jsontable.jsonTotable(schemaName,jsonDate,"");*/
 
 
 
-        Map<String,Object> output=null;
-        output.put("success","成功返回");
+        Map<String, Object> output = new HashMap<>();
+        Map<String, String> message = new HashMap<>();
+        message.put("success","成功返回");
+        output.put("message", message);
         return output;
     }