merge

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

@@ -52,5 +52,7 @@ public class DisableInfoVo extends PageInfo {
 
     private String srvOrganName;
 
+    private String diseTypeS;
+
 
 }

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

@@ -14,9 +14,9 @@ public interface DisableInfoMapper extends BaseMapper<ChDisableInfo> {
 
     @Select("select s.real_name," +
             "i.SRV_SEND_ID," +
-            "       s.acpt_provincial," +
-            "       s.acpt_city," +
-            "       s.acpt_area," +
+            "       j.acpt_provincial," +
+            "       j.acpt_city," +
+            "       j.cpt_area," +
             "       s.gender," +
             "       s.birthday," +
             "       s.certi_code," +
@@ -29,7 +29,10 @@ public interface DisableInfoMapper extends BaseMapper<ChDisableInfo> {
             "       i.allot_time," +
             "       i.stop_time," +
             "       i.status," +
-            "       j.acpt_address" +
+            "       j.acpt_address," +
+            "       s.DISTRICT_PROVINCIAL as provincial," +
+            "       s.DISTRICT_CITY as city," +
+            "       s.DISE_TYPE_S as diseTypeS" +
             "       from ch_srv_send i" +
             "       left join ch_disable_info s " +
             "       on s.disab_info_id = i.disab_info_id" +