Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

liujie

9 天以前 f8d30932873605f5eb407228b22a38ec5ff96af9

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TErpProcurementMapper.java

@@ -20,6 +20,6 @@
 */
public interface TErpProcurementMapper extends BaseMapper<TErpProcurement> {

    List<TErpProcurementVo> pageList(@Param("query") TErpProcurementQuery query, @Param("pageInfo") PageInfo<TErpProcurementVo> pageInfo, @Param("user") SysUser user, @Param("sTime") String sTime, @Param("eTime") String eTime);
    List<TErpProcurementVo> pageList(@Param("query") TErpProcurementQuery query, @Param("pageInfo") PageInfo<TErpProcurementVo> pageInfo, @Param("user") SysUser user, @Param("sTime") String sTime, @Param("eTime") String eTime, @Param("supplierClinicId") String supplierClinicId);

}