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

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/BasicGridAcceptanceServiceImpl.java

@@ -87,18 +87,15 @@ public class BasicGridAcceptanceServiceImpl
 		return pageNew;
 	}
 
-	public HygfOnGrid saveEntity(HygfOnGrid grid) {
-		if (grid.getSequenceNbr() != null) {
-			onGridMapper.updateById(grid);
-		} else {
-			onGridMapper.insert(grid);
-		}
-
+	public synchronized HygfOnGrid saveEntity(HygfOnGrid grid) {
+		LambdaQueryWrapper<HygfOnGrid> hog = new LambdaQueryWrapper<>();
+		hog.eq(HygfOnGrid::getPeasantHouseholdId, grid.getPeasantHouseholdId());
+		hygfOnGridServiceImpl.saveOrUpdate(grid,hog);
 		return grid;
 	}
 
 	@GlobalTransactional
-	public HygfOnGrid saveAndCommit(HygfOnGrid grid, String userId) {
+	public synchronized HygfOnGrid saveAndCommit(HygfOnGrid grid, String userId) {
 
 		BasicGridAcceptance basicGridAcceptance = basicGridAcceptanceMapper
 				.selectOne(new LambdaQueryWrapper<BasicGridAcceptance>()

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/OverviewQuestionDto.java

@@ -13,8 +13,9 @@ public class OverviewQuestionDto {
     private String createDate;
 
     @ApiModelProperty(value = "问题内容")
-    private String warningContent;
-
+    private String content;
+    @ApiModelProperty(value = "问题内容")
+    private String content_;
     @ApiModelProperty(value = "问题完成情况描述")
     private String completionStatusDesc;