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

skyouc

6 天以前 d8d34b1eda59c88f8de91d889165f63132a29499

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

@@ -7,6 +7,7 @@
import com.vincent.rsf.common.utils.Utils;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.DateUtils;
import lombok.Getter;

import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
@@ -21,6 +22,7 @@
    private static final long serialVersionUID = 1L;
    public static final String ORDER_DESC_VALUE = "desc";

    @Getter
    private final U where;

    /**