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

huanghongfa

2021-08-16 ac0f1610e21b5326d4c7c263aa5cf410d9e2465c

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/BcDictionaryVO.java

@@ -20,4 +20,8 @@
    private String dictValue;
    @ApiModelProperty(value = "字典项助记码")
    private String code;
    /**
     * 字典id
     */
    private Long dictId;
}