合并冲突

shuishen

2021-06-03 cd411e7b3ade23951e8935924252f7059cc096d5

1
2
//>>built
define(["dojo/_base/declare","../Calendar","./_DateTimeTextBox"],function(a,b,c){return a("dijit.form.DateTextBox",c,{baseClass:"dijitTextBox dijitComboBox dijitDateTextBox",popupClass:b,_selector:"date",maxHeight:Infinity,value:new Date("")})});