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

src/main/resources/templates/flea-market/form.html

@@ -89,11 +89,11 @@
                     </div>
                      <div class="unlogin-item input-item shrink-spacing">
                         <div class="unlogin-label spacing" style="letter-spacing: 1px;">采美对接人：</div>
-                        <input type="text" maxlength="15" v-model="secondParams.dockingPeopleName"  placeholder="请输入采美对接人姓名">
+                        <input type="text" maxlength="15" v-model="secondParams.dockingPeopleName"  placeholder="请输入采美对接人姓名，没有可不填">
                     </div>
                     <div class="unlogin-item input-item shrink-spacing">
                         <div class="unlogin-label spacing">采美对接人联系方式：</div>
-                        <input type="text"  v-model="secondParams.dockingPeopleMobile"  oninput="value=value.replace(/[^\d]/g,'')"  maxlength="11" placeholder="请输入采美对接人手机号">
+                        <input type="text"  v-model="secondParams.dockingPeopleMobile"  oninput="value=value.replace(/[^\d]/g,'')"  maxlength="11" placeholder="请输入采美对接人手机号，没有可不填">
                         <span class="release-tips errTips icon mIcon" v-show="vShow_caimeiMobile">{{fromMessage}}</span>
                     </div>
                     <div class="unlogin-item input-item shrink-spacing">