解决合并冲突

5 years ago · fd45d66968
parent e57acfacee
commit fd45d66968
1 changed files with 2 additions and 2 deletions
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java
@ -52,10 +52,10 @@ public class WmsReportTransDetailModel extends BaseBean {
    @ApiParam(value = "数量")
    private Double qty;

-    @ApiParam(value = "包规")
+    @ApiParam(value = "供应商批次")
    private String dateCode;

-    @ApiParam(value = "供应商批次")
+    @ApiParam(value = "包规")
    private Double snp;

    @ApiParam(value = "收货批次")