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

tangxiaobao

2021-08-19 4cb51a8d6a46993cb30e22dcbaf85424a0ba9d43

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCorrectPopulationVO.java

@@ -20,7 +20,7 @@
 */

@Data
@ApiModel("吸毒人员表")
@ApiModel("社区矫正表")
@EncryptDecryptClass
public class ComCorrectPopulationVO {