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

64e6cd3c · hujun · f2c052e1 · 5a9c5c57 · 64e6cd3c · 64e6cd3c
Commit 64e6cd3c authored Jul 03, 2018 by hujun
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

agent.html application/index/view/agent/agent.html +1 -1

agent.js public/resource/js/agent.js +0 -0

No files found.
--- a/application/index/view/agent/agent.html
+++ b/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>


--- a/public/resource/js/agent.js
+++ b/public/resource/js/agent.js