Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-20 f50e081f650eb067cce44fce3db64a237fde145b

 zq-erp/src/main/java/com/matrix/system/common/bean/SysUsers.java

@@ -19,8 +19,11 @@
    private static final long serialVersionUID = 1L;

    /** 有效*/
    @Extend
    public static final String VALID_Y="Y";

    /** 无效*/
    @Extend
    public static final String VALID_N="N";

    private Long suId;