hbwri/skjcmanager.git

湖北水库项目

summary
reflog
commits
tree
docs
forks
compare

Merge remote-tracking branch 'origin/jtdev' into jtdev

2024-05-15 ab5c1c6cbcdeb98d84bdde3c111fe871466d3a5c

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java

@@ -72,7 +72,9 @@
      tbResGeneralInvestigationStateService.saveOrUpdate(state);

      entity.setTbStateId(state.getGuid());
      return R.status(this.saveOrUpdate(entity));
//      return R.status(this.saveOrUpdate(entity));
      this.saveOrUpdate(entity);
      return R.data(entity);
   }

   @Override

			@@ -72,7 +72,9 @@
			tbResGeneralInvestigationStateService.saveOrUpdate(state);

			entity.setTbStateId(state.getGuid());
			return R.status(this.saveOrUpdate(entity));
			// return R.status(this.saveOrUpdate(entity));
			this.saveOrUpdate(entity);
			return R.data(entity);
			}

			@Override