Merge remote-tracking branch 'origin/master'

sgj

2026-01-05 7b973b3b9b723f48c54f2c0c5083886573224541

 fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java

@@ -63,6 +63,7 @@
      InoutNoticeIn data = new InoutNoticeIn();
      data.setId(ContextUtil.generateOrderId("RK"));
      data.setName("入库通知单");
        data.setType("20");
      data.setCompanyId(user.getCompanyId());
      data.setDeptId(ContextUtil.subDeptId(user));
      data.setYear(DateFormatUtils.format(new Date(), "yyyy"));