Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java

@@ -1098,7 +1098,7 @@ public class CollectModel {
      * 功能：填报者保存填报结果
      */
     public void saveFormJob(int job_id, String bureau_id, String person_id, String table_name, String json) {
-        JSONObject jo = JSONObject.parseObject(json);
+        JSONObject j1 = JSONObject.parseObject(json);
         Record record = new Record();
         record.set("job_id", job_id);
         record.set("bureau_id", bureau_id);
@@ -1115,7 +1115,7 @@ public class CollectModel {
             _map.put(j2.getString("id"), data_type_id);//哪个字段是什么类型
         }
 
-        for (Map.Entry<String, Object> entry : jo.entrySet()) {
+        for (Map.Entry<String, Object> entry : j1.entrySet()) {
             String key = entry.getKey();
             int data_type_id = _map.get(key);
             switch (data_type_id) {