Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-service

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/controller/SyOrderDataItemController.java

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.documents.orderData.service.ISyOrderDataService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -48,6 +49,8 @@ import io.swagger.annotations.ApiOperation;
 public class SyOrderDataItemController extends JeecgController<SyOrderDataItem, ISyOrderDataItemService> {
 	@Autowired
 	private ISyOrderDataItemService syOrderDataItemService;
+	@Autowired
+	private ISyOrderDataService syOrderDataService;//用于查询详细数据时查子表id关联数据
 	
 	/**
 	 * 分页列表查询

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/entity/SyOrderData.java

@@ -166,4 +166,12 @@ public class SyOrderData {
 	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
 	private java.lang.Object memo;
+	/**备注*/
+	@Excel(name = "供应商", width = 15)
+	@ApiModelProperty(value = "供应商")
+	private java.lang.String supplier;
+	/**备注*/
+	@Excel(name = "账套", width = 15)
+	@ApiModelProperty(value = "账套")
+	private java.lang.String account;
 }