Merge remote-tracking branch 'origin/master'

liyj

2024-09-10 61eb0b1ca4f98c93ce03bbb58237c2d6302859cc

1
2
3
4
<div class="ui-grid-cell-contents">
    <img ng-if="!row.entity.customIcon" ng-src="editor-app/stencilsets/{{getStencilSetName()}}/icons/{{row.entity.icon}}" />
    <img ng-if="row.entity.customIcon" ng-src="{{getImageUrl(row.entity.icon)}}"/>
</div>