Merge remote-tracking branch 'origin/test' into test

application/index/view/agent/agent.html

@@ -39,7 +39,7 @@
 												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="industry_type" placeholder="角色" type="text" value="" name="groupname">
 												<!--<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="dish" placeholder="门店"
                                                     type="text" value="" name="store_name">-->
-												<select class="form-control btn2  input ld-Marheight" name="" id="district_id">
+												<select class="form-control btn2  input ld-Marheight" name="" id="district_id2">
 													<option value="">部门</option>
 												</select>