Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

2025-03-22 e6af1100ab9b98b142ce2e0b158f5416f499628b

Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

 rsf-admin/.env

@@ -1,3 +1,3 @@
VITE_BASE_IP=192.168.4.24
VITE_BASE_IP=192.168.4.16
#VITE_BASE_IP=47.76.147.249
VITE_BASE_PORT=8080

 rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java

@@ -152,9 +152,9 @@
                    String condition = where.getCondition();

                    if (i == 0) {
                        queryWrapper.and(wrapper -> wrapper.like(column, condition));
                        queryWrapper.and(wrapper -> wrapper.like("`" + column + "`", condition));
                    } else {
                        queryWrapper.or().like(column, condition);
                        queryWrapper.or().like("`" + column + "`", condition);
                    }
                }
            }