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

src/apps/afterserviceorder/AfterserviceorderAppBean.java

@@ -36,7 +36,9 @@ public class AfterserviceorderAppBean extends AppBeanCust {
         	if(afterserviceorder.getString("backreason")==null || afterserviceorder.getString("backreason").length()==0) {
         		throw new P2AppException("","退回原因为空不可退回");
         	}else {
-        		afterserviceorder.setValue("fstatus", "新建");
+        		afterserviceorder.setValue("fstatus", "新建",11L);
+        		afterserviceorder.setValue("submitby", "",11L);
+        		afterserviceorder.setValue("submitdate", "",11l);
 			}
         	 this.SAVE();
              this.REFRESH();

src/apps/hyworker/hyworker.java

@@ -46,10 +46,10 @@ public class hyworker extends PaoCust {
            pp_hrs.reset();
            if(!pp_hrs.isEmpty()) {
         	   if(pp_hrs.getPao(0).getString("DISPLAYNAME")!=null && pp_hrs.getPao(0).getString("DISPLAYNAME").length()!=0){
-        		setValue("fname", pp_hrs.getPao(0).getString("DISPLAYNAME"));   
+        		setValue("fname", pp_hrs.getPao(0).getString("DISPLAYNAME"),11l);   
         	   }
         	   if(pp_hrs.getPao(0).getString("PRIMARYPHONE")!=null && pp_hrs.getPao(0).getString("PRIMARYPHONE").length()!=0){
-           		setValue("WORKPHONE", pp_hrs.getPao(0).getString("PRIMARYPHONE"));   
+           		setValue("WORKPHONE", pp_hrs.getPao(0).getString("PRIMARYPHONE"), 11l);   
            	   }
            }