Merge branches 'master' and 'master' of http://192.168.0.105:10010/r/pyhmap

shuishen

2021-06-18 bb3721b514c504682b57129c36a5e205f8f50400

1
.claro .dijitDialogRtl .dijitDialogCloseIcon {right: auto; left: 5px;}.claro .dijitDialogRtl .dijitDialogPaneActionBar {text-align: left; padding: 3px 7px 2px 5px;}