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

This commit is contained in:
yinglong zhang
2021-07-13 15:36:33 +08:00
58 changed files with 3703 additions and 87 deletions
@@ -1068,6 +1068,7 @@ public class ActSarItemsEOService {
}
break;
case "standType": sarStandardsInfoEO.setStandType(valueStr); break;
case "standSystem": sarStandardsInfoEO.setStandSystem(valueStr); break;
case "standYear": sarStandardsInfoEO.setStandYear(valueStr); break;
case "standNature": sarStandardsInfoEO.setStandNature(valueStr); break;
case "standEnName": sarStandardsInfoEO.setStandEnName(valueStr); break;