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

luliqiang

2020-07-12 9140edf9b115a6b38c599878093d595ef84228f1

1
2
3
4
5
6
7
8
9
10
11
12
13
14
package com.kidgrow.usercenter.vo;
 
import com.kidgrow.usercenter.model.SysCompany;
import lombok.Data;
 
@Data
public class SysCompanyVo extends SysCompany {
    private String sheng;
    private Long shengId;
    private String shi;
    private Long shiId;
    private String xian;
    private Long xianId;
}