Merge branch 'dev' of http://192.168.1.220:10080/jiwei/wlyy2.0 into dev

common/common-entity/src/main/java/com/yihu/jw/entity/base/role/MenuDO.java

@@ -48,6 +48,11 @@ public class MenuDO extends UuidIdentityEntityWithOperator {
	 */
	private String remark;
	/**
	 * 是否展示（1是，2否）
     */
	private Integer show;
	@Column(name = "saas_id", length = 50)
	public String getSaasId() {
		return this.saasId;
@@ -128,4 +133,13 @@ public class MenuDO extends UuidIdentityEntityWithOperator {
	public void setMethod(String method) {
		this.method = method;
	}
	@Column(name = "show")
	public Integer getShow() {
		return show;
	}
	public void setShow(Integer show) {
		this.show = show;
	}
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -136,6 +136,7 @@ public class BaseRequestMapping {
    public static class SystemDict extends Basic {
        public static final String PREFIX  = "/system_dict";
        public static final String ALL  = "/query_all";
        public static final String QUERY_BY_SAASID = "/queryBySaasId";
        public static final String QUERY_BY_TYPE  = "/query_by_type";
    }

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/role/MenuVO.java

@@ -29,6 +29,8 @@ public class MenuVO extends UuidIdentityVOWithOperator {
    private Integer status;
    @ApiModelProperty(value = "备注", example = "说明")
    private String remark;
    @ApiModelProperty(value = "是否展示（1是，2否）", example = "1")
    private Integer show;
    @ApiModelProperty(value = "子集")
    private List<MenuVO> children = new ArrayList<>();
@@ -88,6 +90,14 @@ public class MenuVO extends UuidIdentityVOWithOperator {
        this.remark = remark;
    }
    public Integer getShow() {
        return show;
    }
    public void setShow(Integer show) {
        this.show = show;
    }
    public List<MenuVO> getChildren() {
        return children;
    }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/system/SystemDictEndpoint.java

@@ -108,6 +108,24 @@ public class SystemDictEndpoint extends EnvelopRestEndpoint {
        return failed(message);
    }
    @GetMapping(value = BaseRequestMapping.SystemDict.QUERY_BY_SAASID)
    @ApiOperation(value = "根据字典类型获取字典")
    public ListEnvelop queryDictBySaasId(
            @ApiParam(name = "saasId", value = "saasId")
            @RequestParam(value = "saasId", required = true) String saasId,
            @ApiParam(name = "type", value = "字典类型")
            @RequestParam(value = "type", required = true) String type,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size
    ) throws Exception {
        JSONArray list = systemDictService.getDistListByType(type,saasId,sorts,page,size);
        return success(list);
    }
    @PostMapping(value = BaseRequestMapping.SystemDict.QUERY_BY_TYPE)
    @ApiOperation(value = "根据字典类型获取字典")
    public ListEnvelop queryDictByType(