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

src/main/java/com/dsideal/QingLong/StudentYd/Model/StudentYdModel.java

@@ -180,7 +180,7 @@ public class StudentYdModel {
         String target_bureau_id = record.getStr("target_bureau_id");
         record.set("status_id", status_id);
         record.set("echo_message", echo_message);
-        record.set("echo_time", CommonUtil.GetCurrentTimeString());
+        record.set("echo_time", DateTime.now());
         record.remove("target_bureau_name");
         record.remove("source_bureau_name");
         record.remove("class_name");
@@ -199,7 +199,7 @@ public class StudentYdModel {
             String main_school_id = rs.getFirst().getStr("main_school_id");
             //修改到新的单位和部门下
             sql = Db.getSql("loginPerson.changePersonClass");
-            Db.update(sql, city_id, area_id, main_school_id, target_bureau_id, class_id, operator, ip_address, person_id);
+            Db.update(sql, city_id, area_id, main_school_id, target_bureau_id, class_id, operator, IpUtil.ipToLong(ip_address), person_id);
         }
         return true;
     }