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

src/dsb/com/cnd3b/restcontroller/customer/activity/activitysignup.java

@@ -29,10 +29,10 @@ public class activitysignup extends Controller {
         String fname = content.getString("fname", "tactivitysignup.fname", "姓名");
         String fidcard = content.getString("fidcard", "tactivitysignup.fidcard", "身份证号");
         String fphonenumber = content.getString("fphonenumber", "tactivitysignup.fphonenumber", "手机号");
-        String findustry = content.getString("findustry", "tactivitysignup.findustry", "行业");
-        String fcompname = content.getString("fcompname", "tactivitysignup.fcompname", "公司");
-        String frole = content.getString("frole", "tactivitysignup.frole", "职位");
-        String faddress = content.getString("faddress", "tactivitysignup.faddress", "住址");
+        String findustry = content.getString("findustry", 30,"行业");//"行业"
+        String fcompname = content.getString("fcompname", 30,"公司");
+        String frole = content.getString("frole", 30,"职位");
+        String faddress = content.getString("faddress", 30,"住址");
         String fchannel = content.getString("fchannel", "tactivitysignup.fchannel", "入会渠道");
 
         PaoSetRemote tscanningSet = getP2ServerSystemPaoSet("tactivitysignup", "siteid='" + siteid + "' and tactivityid ='" + tactivityid + "' and tenterprise_userid='" + userid + "'");