Merge branch '1.0' of http://gogs.tcmbrain.com/zjh/pre_paramater into 1.0

cbkj_web_parameter/src/main/resources/mappers/drug/TDrugListMapper.xml

@@ -98,5 +98,21 @@
             </if>
         </where>
     </select>
+    <select id="getPageListByObj2" resultMap="BaseResultMap" parameterType="TDrugList">
+        select <include refid="Base_Column_List" />
+        from t_drug_list
+<where>
+            status = '1'
+    <if test="drugName != null and drugName !=''">
+        and drug_name  like CONCAT('%',trim(#{drugName}),'%')
+    </if>
+    <if test="drugType != null and drugType != ''">
+        and drug_type = #{ drugType }
+    </if>
+    <if test="drugId != null and drugId != ''">
+        and drug_id = #{drugId}
+    </if>
+</where>
+    </select>
 
 </mapper>