合并冲突

shuishen

2021-06-03 cd411e7b3ade23951e8935924252f7059cc096d5

1
.dijitEditorEilDialogTitle {font-weight: bold; margin-bottom: 0.6em;}.dijitEditorEilDialogDescription {white-space: normal; margin: 0em 0em 0.3em 0em;}.dijitEditorEilDialogField{width: 20em;}