do merge develop code to test

-<div class="my-edit-address-page page-wrap hide">
-    <form class="edit-address">
-        <input type="hidden" name="id" value="">
-        <label class="username">
-            收件人姓名
-            <input type="text" name="consignee" value="">
-        </label>
-        <label class="mobile">
-            手机号码
-            <input type="text" name="mobile" value="">
-        </label>
-        <label class="area">
-            省市区
-            <input type="hidden" name="area_code" value="">
-            <input type="text" name="area" value="" readonly>
-            <span class="iconfont">&#xe604;</span>
-        </label>
-        <label class="address">
-            详细地址   
-            <textarea name="address"></textarea>
-        </label>
-
-    </form>
-
-    <div class="submit">
-        确认
-    </div>
-</div>
\ No newline at end of file