Merge remote-tracking branch 'origin/master'

src/main/java/cn/ezhizao/project/business/controller/BizInboundOrderController.java

@@ -302,7 +302,7 @@ public class BizInboundOrderController extends BaseController {
             if (checkDetails.stream().noneMatch(x -> x.getCertificateCode().equals(l))) {
                 detail.setCertificateId(item != null ? item.getCertificateId() : null);
                 detail.setCertificateLotId(item != null ? item.getId() : null);
-                detail.setInboundNum(certificate != null ? Long.valueOf(certificate.getPackageNumber()) : null);
+                detail.setInboundNum(certificate != null ? Long.valueOf(certificate.getLabelNumber()) : null);
                 // 第一个操作人
                 detail.setFirstOperatorUserId(!packageResourceGroupDetails.isEmpty() ? packageResourceGroupDetails.get(0).getUserId() : null);
                 detail.setFirstOperatorUserName(!packageResourceGroupDetails.isEmpty() ? packageResourceGroupDetails.get(0).getUserName() : null);