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

# Conflicts:
#	adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
This commit is contained in:
Mr.Z
2021-09-28 10:52:29 +08:00
14 changed files with 160 additions and 18 deletions
@@ -53,4 +53,8 @@ public class SarStandItemsDto {
private String zccssrq;
private String technicalRequir;
private String changePoint;
}