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

# Conflicts: # adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java # adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java # adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java # adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
2021-07-22 16:25:23 +08:00
parent 91c4dea4db ae16a14ea1
commit 3cafbfbb6f
52 changed files with 1202 additions and 167 deletions
@@ -156,5 +156,9 @@ public class SarStandItems extends BaseEntity {
    @TableField(exist = false)
    private SarCompStatusInfo pgForm;

+    //责任工程师
+    private String responsibleEngineer;
+
+

 }
@@ -32,7 +32,7 @@ public class SarStandItemsDto {
    private String responsibleUnit;


-
+    private String responsibleEngineer;