Merge remote-tracking branch 'Gogs/develop' into develop

src/rest/openapi/restcontroller/hyworkorder/web/afterserviceorder/SQL/服务单关联物料.sql

@@ -1,4 +1,4 @@
-select t1.fitemno,t2.fitemname,t2.fspec,t2.fmodel from Afterserviceorder t
-join hyAfterserviceorder_titem t1 on t1.fparentid=t.Afterserviceordeid
-join titem t2 on t2.fitemno=t1.fitemno
+select t2.siteid,t1.fitemno,t2.fitemname,t2.fspec,t2.fmodel from Afterserviceorder t
+join hyAfterserviceorder_titem t1 on t1.fparentid=t.Afterserviceordeid  and t.siteid=t1.siteid 
+join titem t2 on t2.fitemno=t1.fitemno and t2.siteid=t1.siteid 
 where t.servicenum=$servicenum$