Merge remote-tracking branch 'origin/develop' into develop-test

# Conflicts:
#	src/custom/restcontroller/R.java

src/custom/restcontroller/R.java

@@ -7568,6 +7568,11 @@ public class R {
         }
     }
 
+    public static class ID2026042815542102 {
+        public static class v1 {
+        }
+    }
+
     public static class ID2026041113372302 {
         public static class v1 {
         }

src/custom/restcontroller/webmanage/sale/serviceorder/serviceorder.java

@@ -398,11 +398,24 @@ public class serviceorder extends Controller {
         } else {
             row.put("backreason", "");
         }
-
+        row.putIfAbsent("noticedate","");
 
         return getSucReturnObject().setData(row).toString();
     }
 
+    @API(title = "通知时间", apiversion = R.ID2026042815542102.v1.class)
+    public String updateNoticeDate() throws YosException {
+        Long sa_serviceorderid = content.getLongValue("sa_serviceorderid");
+        UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, "sa_serviceorder");
+        updateSQL.setUniqueid(sa_serviceorderid);
+        updateSQL.setSiteid(siteid);
+        updateSQL.setValue("noticedate", getDateTime_Str());
+        updateSQL.update();
+        DataContrlLog.createLog(this, "sa_serviceorder", sa_serviceorderid, "通知时间", "已通知").insert();
+        return getSucReturnObject().toString();
+    }
+
+
     @API(title = "服务申请单详情（不验证token））", apiversion = R.ID20230217133003.v1.class, accesstoken = false)
     public String queryserviceorderMainWithoutToken() throws YosException {
         Long sa_serviceorderid = content.getLong("sa_serviceorderid");