Merge remote-tracking branch 'origin/master'

yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItem.java

@@ -56,6 +56,10 @@ public class AsServiceItem extends BaseEntity {
     private String useOrgSid;
     @ApiModelProperty("创建组织sid")
     private String createOrgSid;
+    @ApiModelProperty("科目")
+    private String subjectName;
+    @ApiModelProperty("科目sid")
+    private String subjectSid;
 
 
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemDetailsVo.java

@@ -91,5 +91,8 @@ public class AsServiceItemDetailsVo implements Vo {
     @ApiModelProperty("创建组织sid")
     private String createOrgSid;
     private String orgPath;
-
-}
+    @ApiModelProperty("科目")
+    private String subjectName;
+    @ApiModelProperty("科目sid")
+    private String subjectSid;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemDto.java

@@ -89,4 +89,8 @@ public class AsServiceItemDto implements Dto {
     @ApiModelProperty("创建组织sid")
     private String createOrgSid;
     private String orgPath;
-}
+    @ApiModelProperty("科目")
+    private String subjectName;
+    @ApiModelProperty("科目sid")
+    private String subjectSid;
+}