Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

frontend/saas-web/app/view/core/form/field/ConDateField.js

@@ -122,7 +122,7 @@ Ext.define('saas.view.core.form.field.ConDateField', {
         });
         var t = this.value;
         if(!t || !t in [1,2,3,4,5,6,7]) {
-            t = 3;
+            t = 1;
         }
         this.value = null;
         this.setInitValue(t);