diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryMerchantInfoDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryMerchantInfoDTO.java index b859273f2..e13959d7f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryMerchantInfoDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryMerchantInfoDTO.java @@ -17,10 +17,26 @@ public class QueryMerchantInfoDTO { private Integer pageNum; + /** + * 运营商id + */ private String merchantId; + /** + * 运营商名称 + */ private String merchantName; + /** + * 负责人名称 + */ + private String managerName; + + /** + * 负责人手机号 + */ + private String managerPhone; + private List deptIds; } diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml index 871db2d15..d3b81efed 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml @@ -400,5 +400,11 @@ and t1.id = #{dto.merchantId,jdbcType=VARCHAR} + + and t1.manager_name = #{dto.managerName,jdbcType=VARCHAR} + + + and t1.manager_phone = #{dto.managerPhone,jdbcType=VARCHAR} + \ No newline at end of file diff --git a/jsowell-ui/src/views/financial/merchant.vue b/jsowell-ui/src/views/financial/merchant.vue index cdaa7807d..013427a1d 100644 --- a/jsowell-ui/src/views/financial/merchant.vue +++ b/jsowell-ui/src/views/financial/merchant.vue @@ -18,6 +18,22 @@ /> + + + + + +