Merge branch 'master' of http://211.149.162.168:8090/r/product/product-serv...

许鹏程

2023-08-22 c904bb22a132d75cb7f717d5a725b9624bdcf68e

 src/main/java/com/product/administration/service/ConferenceManagerService.java

@@ -152,6 +152,10 @@
    @Override
    @Transactional
    public String saveConferenceApply(FieldSetEntity fse) throws BaseException {
        if ("0".equals(fse.getString("type"))){
            baseDao.saveFieldSetEntity(fse);
            return fse.getUUID();
        }
        if (StringUtils.isEmpty(fse.getUUID())) {
            fse.setValue(CmnConst.ORG_LEVEL_UUID, SpringMVCContextHolder.getCurrentUser().getOrg_level_uuid());
            fse.setValue("flow_flag", 0);