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

# Conflicts:
#	common/common-entity/sql记录

common/common-entity/src/main/java/com/yihu/jw/entity/care/common/DoctorServicePermissionsDO.java

@@ -36,25 +36,25 @@ public class DoctorServicePermissionsDO extends UuidIdentityEntityWithCreateTime
     11我的服务
     12通讯录
     */
    private Integer sevice1;
    private Integer sevice2;
    private Integer sevice3;
    private Integer sevice4;
    private Integer sevice5;
    private Integer sevice6;
    private Integer sevice7;
    private Integer sevice8;
    private Integer sevice9;
    private Integer sevice10;
    private Integer sevice11;
    private Integer sevice12;
    private Integer service1;
    private Integer service2;
    private Integer service3;
    private Integer service4;
    private Integer service5;
    private Integer service6;
    private Integer service7;
    private Integer service8;
    private Integer service9;
    private Integer service10;
    private Integer service11;
    private Integer service12;
    /**
     * 备用字段
     */
    private Integer sevice13;
    private Integer sevice14;
    private Integer sevice15;
    private Integer sevice16;
    private Integer service13;
    private Integer service14;
    private Integer service15;
    private Integer service16;
    @Column(name = "org_code")
    public String getOrgCode() {
@@ -92,133 +92,132 @@ public class DoctorServicePermissionsDO extends UuidIdentityEntityWithCreateTime
        this.doctorName = doctorName;
    }
    @Column(name = "sevice1")
    public Integer getSevice1() {
        return sevice1;
    @Column(name = "service1")
    public Integer getService1() {
        return service1;
    }
    public void setSevice1(Integer sevice1) {
        this.sevice1 = sevice1;
    public void setService1(Integer service1) {
        this.service1 = service1;
    }
    @Column(name = "sevice2")
    public Integer getSevice2() {
        return sevice2;
    @Column(name = "service2")
    public Integer getService2() {
        return service2;
    }
    public void setSevice2(Integer sevice2) {
        this.sevice2 = sevice2;
    public void setService2(Integer service2) {
        this.service2 = service2;
    }
    @Column(name = "sevice3")
    public Integer getSevice3() {
        return sevice3;
    @Column(name = "service3")
    public Integer getService3() {
        return service3;
    }
    public void setSevice3(Integer sevice3) {
        this.sevice3 = sevice3;
    public void setService3(Integer service3) {
        this.service3 = service3;
    }
    @Column(name = "sevice4")
    public Integer getSevice4() {
        return sevice4;
    @Column(name = "service4")
    public Integer getService4() {
        return service4;
    }
    public void setSevice4(Integer sevice4) {
        this.sevice4 = sevice4;
    public void setService4(Integer service4) {
        this.service4 = service4;
    }
    @Column(name = "sevice5")
    public Integer getSevice5() {
        return sevice5;
    @Column(name = "service5")
    public Integer getService5() {
        return service5;
    }
    public void setSevice5(Integer sevice5) {
        this.sevice5 = sevice5;
    public void setService5(Integer service5) {
        this.service5 = service5;
    }
    @Column(name = "sevice6")
    public Integer getSevice6() {
        return sevice6;
    @Column(name = "service6")
    public Integer getService6() {
        return service6;
    }
    public void setSevice6(Integer sevice6) {
        this.sevice6 = sevice6;
    public void setService6(Integer service6) {
        this.service6 = service6;
    }
    @Column(name = "sevice7")
    public Integer getSevice7() {
        return sevice7;
    @Column(name = "service7")
    public Integer getService7() {
        return service7;
    }
    public void setSevice7(Integer sevice7) {
        this.sevice7 = sevice7;
    public void setService7(Integer service7) {
        this.service7 = service7;
    }
    @Column(name = "sevice8")
    public Integer getSevice8() {
        return sevice8;
    @Column(name = "service8")
    public Integer getService8() {
        return service8;
    }
    public void setSevice8(Integer sevice8) {
        this.sevice8 = sevice8;
    public void setService8(Integer service8) {
        this.service8 = service8;
    }
    @Column(name = "sevice9")
    public Integer getSevice9() {
        return sevice9;
    @Column(name = "service9")
    public Integer getService9() {
        return service9;
    }
    public void setSevice9(Integer sevice9) {
        this.sevice9 = sevice9;
    public void setService9(Integer service9) {
        this.service9 = service9;
    }
    @Column(name = "sevice10")
    public Integer getSevice10() {
        return sevice10;
    @Column(name = "service10")
    public Integer getService10() {
        return service10;
    }
    public void setSevice10(Integer sevice10) {
        this.sevice10 = sevice10;
    public void setService10(Integer service10) {
        this.service10 = service10;
    }
    @Column(name = "sevice11")
    public Integer getSevice11() {
        return sevice11;
    @Column(name = "service11")
    public Integer getService11() {
        return service11;
    }
    public void setSevice11(Integer sevice11) {
        this.sevice11 = sevice11;
    public void setService11(Integer service11) {
        this.service11 = service11;
    }
    @Column(name = "sevice12")
    public Integer getSevice12() {
        return sevice12;
    @Column(name = "service12")
    public Integer getService12() {
        return service12;
    }
    public void setSevice12(Integer sevice12) {
        this.sevice12 = sevice12;
    public void setService12(Integer service12) {
        this.service12 = service12;
    }
    @Column(name = "sevice13")
    public Integer getSevice13() {
        return sevice13;
    @Column(name = "service13")
    public Integer getService13() {
        return service13;
    }
    public void setSevice13(Integer sevice13) {
        this.sevice13 = sevice13;
    public void setService13(Integer service13) {
        this.service13 = service13;
    }
    @Column(name = "sevice14")
    public Integer getSevice14() {
        return sevice14;
    @Column(name = "service14")
    public Integer getService14() {
        return service14;
    }
    public void setSevice14(Integer sevice14) {
        this.sevice14 = sevice14;
    public void setService14(Integer service14) {
        this.service14 = service14;
    }
    @Column(name = "sevice15")
    public Integer getSevice15() {
        return sevice15;
    @Column(name = "service15")
    public Integer getService15() {
        return service15;
    }
    public void setSevice15(Integer sevice15) {
        this.sevice15 = sevice15;
    public void setService15(Integer service15) {
        this.service15 = service15;
    }
    @Column(name = "sevice16")
    public Integer getSevice16() {
        return sevice16;
    @Column(name = "service16")
    public Integer getService16() {
        return service16;
    }
    public void setSevice16(Integer sevice16) {
        this.sevice16 = sevice16;
    public void setService16(Integer service16) {
        this.service16 = service16;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/doctor/DoctorServicePermissionsEndpoint.java

@@ -24,7 +24,7 @@ import java.util.List;
 * @Description:
 */
@RestController
@RequestMapping(value = "doctorServicePermissions",consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@RequestMapping(value = "doctorServicePermissions", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(value = "医生服务权限管理", description = "医生服务权限管理", tags = {"wlyy基础服务 - 医生服务权限管理"})
public class DoctorServicePermissionsEndpoint extends EnvelopRestEndpoint {