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

jyy

2021-06-09 ec87cf1ee2b9382bf9d089711f0ff82ae8e7077c

 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;