Merge branch 'test' into 'test_screen'

罗元桥

2021-06-22 c6512655e722d9ca80dd8c34b79f6d3923ecf86c

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActPopulationScreenVO.java

@@ -12,7 +12,7 @@
 * @date 2021/6/15 14:36
 */
@Data
@ApiModel("大屏人口")
@ApiModel("大屏-人口")
public class ComActPopulationScreenVO implements Serializable {