Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_print_List.ftl

watero-rst-web/src/main/java/com/iamberry/rst/utils/StitchAttrUtil.java

@@ -10,7 +10,7 @@ public class StitchAttrUtil {
 
     /**
      * 组装参数时，会过滤以下参数
-     * 推荐使用：addNoPro()，能够暂时过滤，不影响下次使用
+     * 推荐使用：addNoPro()，添加过滤
      */
     public final static String noProperty[] = {
             "serialVersionUID",

watero-rst-web/src/main/webapp/WEB-INF/views/order/excel_to_order.ftl

@@ -104,6 +104,8 @@
                             <option value="31">艾德叔叔</option>
                             <option value="32">钱儿频道</option>
                             <option value="33">尹建莉</option>
+							<option value="34">老虎工作室</option>
+							<option value="35">有赞</option>
                         </select>
                     </label>
                 </td>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/softwareVersion/software_version_add.ftl

@@ -106,14 +106,14 @@
                 cache: true,
                 type: "POST",
                 data: $("#form-parts-add").serialize(),
-                url: "${path}/admin/softwareVersion/add_machineVersion",
+                url: "${path}/admin/softwareVersion/add_version",
                 async: false,
                 success: function(data){
                     if (data.returnCode == 200) {
                         layer.msg('添加成功！', {icon: 1, time: 2000});
                         window.location.href = document.referrer;
                     }else{
-                        layer.msg('添加失败！', {icon: 2, time: 2000});
+                        layer.msg(data.resultMsg, {icon: 2, time: 2000});
                     }
                 },
                 error: function(XmlHttpRequest, textStatus, errorThrown){

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/gift_card_agent_center.html

@@ -110,7 +110,8 @@
 				<span id="userNickname">水时代watero</span>&nbsp;&nbsp;&nbsp;&nbsp;<span>代理商<span class="mui-icon mui-icon-info" id="btn_go_explain"></span></span>
 			</div>
 			<div>
-				<button type="button" class="my-btn-line" id="my-zeng">我的赠品</button><button type="button" class="my-btn-line" id="my-xiaxian">继续代理</button>
+				<button type="button" class="my-btn-line" id="my-zeng">我的赠品</button>
+				<!--<button type="button" class="my-btn-line" id="my-xiaxian">继续代理</button>-->
 			</div>
 		</div>
 	</div>