diff --git a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/DevInfoVo.java b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/DevInfoVo.java
index f296144..ab15b70 100644
--- a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/DevInfoVo.java
+++ b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/DevInfoVo.java
@@ -34,5 +34,13 @@ public class DevInfoVo extends DevInfo {
     /** 1上架，2下架*/
     private String type;
     /**上下架id*/
-    private  int upId;
+    private int upId;
+    private Integer monthLeasePriceMin;
+    private Integer monthLeasePriceMax;
+    private Integer ageMin;
+    private Integer ageMax;
+    private Integer workingHoursMin;
+    private Integer workingHoursMax;
+    private String monthLeasePriceOrderBy;  // ASC or DESC
+    private String updateTimeOrderBy;   // ASC or DESC
 }
diff --git a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
index 19a7d32..59832b9 100644
--- a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
+++ b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
@@ -57,9 +57,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="brand != null  and brand != ''"> and d.brand = #{brand}</if>
             <if test="modelName != null  and modelName != ''"> and d.model_name like concat('%', #{modelName}, '%')</if>
             <if test="productionDate != null  and productionDate != ''"> and d.production_date = #{productionDate}</if>
-            <if test="workingHours != null  and workingHours != ''"> and d.working_hours = #{workingHours}</if>
+            <if test="workingHoursMin != null  and workingHoursMin != '' and workingHoursMax != null  and workingHoursMax != ''">
+                and d.working_hours &gt;= #{workingHoursMin} and d.working_hours &lt;= #{workingHoursMax}
+            </if>
             <if test="serialNumber != null  and serialNumber != ''"> and d.serial_number = #{serialNumber}</if>
-            <if test="monthLeasePrice != null  and monthLeasePrice != ''"> and d.month_lease_price = #{monthLeasePrice}</if>
+            <if test="monthLeasePriceMin != null  and monthLeasePriceMin != '' and monthLeasePriceMax != null  and monthLeasePriceMax != ''">
+                and d.month_lease_price &gt;= #{monthLeasePriceMin} and d.month_lease_price &lt;= #{monthLeasePriceMax}
+            </if>
             <if test="dayLeasePrice != null  and dayLeasePrice != ''"> and d.day_lease_price = #{dayLeasePrice}</if>
             <if test="picUrl != null  and picUrl != ''"> and d.pic_url = #{picUrl}</if>
             <if test="jsMonthPrice != null  and jsMonthPrice != ''"> and d.js_month_price = #{jsMonthPrice}</if>
@@ -84,6 +88,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 )
             </if>
         </where>
+        order by
+            d.is_active
+            <if test="monthLeasePriceOrderBy != null  and monthLeasePriceOrderBy == 'ASC'">
+                ,d.month_lease_price
+            </if>
+            <if test="monthLeasePriceOrderBy != null  and monthLeasePriceOrderBy == 'DESC'">
+                ,d.month_lease_price DESC
+            </if>
+            <if test="updateTime != null  and monthLeasePriceOrderBy == 'ASC'">
+                ,d.update_time
+            </if>
+            <if test="updateTime != null  and monthLeasePriceOrderBy == 'DESC'">
+                ,d.update_time DESC
+            </if>
     </select>
 
     <select id="selectDevInfoHotList" parameterType="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo" resultType="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo">