Merge branch 'develop_master' into develop_3

# Conflicts: # adc-da-slrs/src/main/resources/mybatis/mapper/SarCompResAssess/SarCompResAssessMapper.xml
2021-06-22 18:15:00 +08:00
parent 12d9bd7b51 37930e0b07
commit bd01b11ea8
30 changed files with 621 additions and 9 deletions
@@ -188,3 +188,4 @@ public class SarStandardsInfo extends BaseEntity {
    private String putTime2;

 }
+