⏪ Reverting changes.回滚sort字段

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/dao/entity/GaeaDictItem.java

@@ -60,7 +60,7 @@ public class GaeaDictItem extends GaeaBaseEntity implements Serializable {
 	/**
 	 * 排序
 	 */
-	private Integer sortOrder;
+	private Integer sort;
 
 	public String getDictCode() {
 		return dictCode;
@@ -102,12 +102,12 @@ public class GaeaDictItem extends GaeaBaseEntity implements Serializable {
 		this.remark = remark;
 	}
 
-	public Integer getSortOrder() {
-		return sortOrder;
+	public Integer getSort() {
+		return sort;
 	}
 
-	public void setSortOrder(Integer sortOrder) {
-		this.sortOrder = sortOrder;
+	public void setSort(Integer sort) {
+		this.sort = sort;
 	}
 
 	public Integer getEnabled() {

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/service/impl/GaeaDictServiceImpl.java

@@ -86,7 +86,7 @@ public class GaeaDictServiceImpl implements GaeaDictService {
 		if (CollectionUtils.isEmpty(dictMap)) {
 			LambdaQueryWrapper<GaeaDictItem> wrapper = Wrappers.lambdaQuery();
 			wrapper.eq(GaeaDictItem::getDictCode, dictCode).eq(GaeaDictItem::getEnabled, Enabled.YES.getValue())
-					.eq(GaeaDictItem::getLocale, language).orderByAsc(GaeaDictItem::getSortOrder);
+					.eq(GaeaDictItem::getLocale, language).orderByAsc(GaeaDictItem::getSort);
 
 			List<GaeaDictItem> list = gaeaDictItemMapper.selectList(wrapper);
 
@@ -154,7 +154,7 @@ public class GaeaDictServiceImpl implements GaeaDictService {
 	public Map<String, List<KeyValue>> all(String language) {
 		LambdaQueryWrapper<GaeaDictItem> wrapper = Wrappers.lambdaQuery();
 		wrapper.eq(GaeaDictItem::getEnabled, Enabled.YES.getValue()).eq(GaeaDictItem::getLocale, language)
-				.orderByAsc(GaeaDictItem::getSortOrder);
+				.orderByAsc(GaeaDictItem::getSort);
 
 		List<GaeaDictItem> list = gaeaDictItemMapper.selectList(wrapper);
 		Map<String, List<KeyValue>> all = list.stream()