merge

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/DisableInfoVo.java

@@ -47,5 +47,10 @@ public class DisableInfoVo extends PageInfo {
     private String acptAddress;
     private Integer srvSendId;
 
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date allotTime;
+
+    private String srvOrganName;
+
 
 }

governance/src/main/java/com/hungraim/ltc/governance/dao/DisableInfoMapper.java

@@ -29,7 +29,7 @@ public interface DisableInfoMapper extends BaseMapper<ChDisableInfo> {
             "       i.allot_time," +
             "       i.stop_time," +
             "       i.status," +
-            "       i.acpt_address" +
+            "       j.acpt_address" +
             "       from ch_srv_send i" +
             "       left join ch_disable_info s " +
             "       on s.disab_info_id = i.disab_info_id" +