czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ww' into test

Browse Source 
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
This commit is contained in:
wangw
2024-10-17 09:57:59 +08:00
parent e2a127c0d0 30f21e1dd3
commit dc9859b31d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
View File

@@ -91,7 +91,7 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
@Override @Override
public Map<String, Object> queryAllAndPro(TbConsInfoQueryCriteria criteria) { public Map<String, Object> queryAllAndPro(TbConsInfoQueryCriteria criteria) {
Sort sort = Sort.by(Sort.Direction.DESC, "consId"); Sort sort = Sort.by(Sort.Direction.DESC, "id");
if(StringUtils.isNotBlank(criteria.getSort())){ if(StringUtils.isNotBlank(criteria.getSort())){
String[] sortParams = criteria.getSort().split(","); String[] sortParams = criteria.getSort().split(",");
String sortField = sortParams[0]; String sortField = sortParams[0];