Merge remote-tracking branch 'origin/master'

Crunchy

2024-04-23 4f986140a10e71c07c7001ccbcda6e93e17736b1

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java

@@ -181,6 +181,7 @@
                                        pl2.setUpdateTime(LocalDateTime.now());
                                        pl2.setId(pl1.getId());
                                        pl2.setSample(tree.getSample());
                                        pl2.setDic(pl1.getDic());
                                        //如果标准库里面的要求有值则不更新,要求为null则同步更新
                                        if (ObjectUtils.isNotEmpty(pl1.getAsk())){
                                            pl2.setAsk(null);