Merge branch 'feature/200315' into 'test6.9.22'

fix rankRecommendParam textarea



See merge request !17

@@ -739,8 +739,7 @@
                             <div class="form-group">
                             <div class="form-group">
                                 <div class="col-sm-10">
                                 <div class="col-sm-10">
                                     <label>推荐逻辑</label>
                                     <label>推荐逻辑</label>
-                                    <input class="form-control observe" value='[[item.rankRecommendParam || ""]]'
-                                    data-field='[[index]].rankRecommendParam'/>
+                                    <textarea rows="2" class="form-control observe" placeholder="品牌，店铺，品类，价格段，品牌是否去重，性别，活动ID,库存，专区，商品池，7天内上新，15天内上新" data-field="[[index]].rankRecommendParam" style="resize: none;">[[item.rankRecommendParam]]</textarea>
                                 </div>
                                 </div>
                             </div>
                             </div>