Merge branch 'feature' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature_bitliker

# Conflicts:
#	WeiChat/src/main/res/values-zh-rCN/strings.xml
#	WeiChat/version.properties

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/DeviceDataFormAddActivity.java

@@ -193,9 +193,7 @@ public class DeviceDataFormAddActivity extends BaseActivity implements View.OnCl
                                 if (data.getName().equals("申请人名称")) {
                                     data.setValue(CommonUtil.getName());
                                 }
-                                if (data.getType().equals("D")) {
-                                    data.setValue(DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS));
-                                }
+
 
                                 if (data.getField().equals("dc_class")) {
                                     JSONArray combostore = JSONUtil.getJSONArray(items, "COMBOSTORE");
@@ -216,6 +214,9 @@ public class DeviceDataFormAddActivity extends BaseActivity implements View.OnCl
                                 data.setIsDefault(items.getIntValue("mfd_isdefault"));
                                 data.setIsNeed(items.getIntValue("mfd_isdefault"));
                                 data.setType(items.getString("fd_type"));
+                                if (data.getType().equals("D")) {
+                                    data.setValue(DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS));
+                                }
                                 if (!StringUtil.isEmpty(value)) {
                                     if (value.equals(items.getString("fd_group"))) {
                                         if (data.getIsNeed() == -1) {