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

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

@@ -58,6 +58,7 @@ public class BusinessSysDictDO extends UuidIdentityEntityWithTime {
     * 归属机构
     */
    private String orgCode;
    private String orgName;
    @Column(name = "model_name")
    public String getModelName() {
@@ -134,6 +135,7 @@ public class BusinessSysDictDO extends UuidIdentityEntityWithTime {
        this.ext2 = ext2;
    }
    @Column(name = "org_code")
    public String getOrgCode() {
        return orgCode;
    }
@@ -141,4 +143,13 @@ public class BusinessSysDictDO extends UuidIdentityEntityWithTime {
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    @Column(name = "org_name")
    public String getOrgName() {
        return orgName;
    }
    public void setOrgName(String orgName) {
        this.orgName = orgName;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/dict/BusinessSysDictService.java

@@ -53,6 +53,10 @@ public class BusinessSysDictService extends BaseJpaService<BusinessSysDictDO, Bu
                businessSysDictDO1.setPyCode(businessSysDictDO.getPyCode());
                businessSysDictDO1.setImgUrl(businessSysDictDO.getImgUrl());
                businessSysDictDO1.setSort(businessSysDictDO.getSort());
                businessSysDictDO1.setExt1(businessSysDictDO.getExt1());
                businessSysDictDO1.setExt2(businessSysDictDO.getExt2());
                businessSysDictDO1.setOrgCode(businessSysDictDO.getOrgCode());
                businessSysDictDO1.setOrgName(businessSysDictDO.getOrgName());
                businessSysDictDO1.setModelName(modelName);
            }else {
                businessSysDictDO1 = new BusinessSysDictDO();
@@ -62,6 +66,10 @@ public class BusinessSysDictService extends BaseJpaService<BusinessSysDictDO, Bu
                businessSysDictDO1.setPyCode(businessSysDictDO.getPyCode());
                businessSysDictDO1.setImgUrl(businessSysDictDO.getImgUrl());
                businessSysDictDO1.setSort(businessSysDictDO.getSort());
                businessSysDictDO1.setExt1(businessSysDictDO.getExt1());
                businessSysDictDO1.setExt2(businessSysDictDO.getExt2());
                businessSysDictDO1.setOrgCode(businessSysDictDO.getOrgCode());
                businessSysDictDO1.setOrgName(businessSysDictDO.getOrgName());
                businessSysDictDO1.setModelName(modelName);
            }
@@ -97,6 +105,8 @@ public class BusinessSysDictService extends BaseJpaService<BusinessSysDictDO, Bu
                " t.sort   as \"sort\","+
                " t.py_code  as \"pyCode\","+
                " t.img_url  as \"imgUrl\","+
                " t.org_code  as \"orgCode\","+
                " t.org_name  as \"orgName\","+
                " t.create_time as \"createTime\""+
                " , t.ext1, t.ext2 from base_business_sys_dict t where 1=1 ";
        if (StringUtils.isNoneBlank(name)){

svr/svr-cloud-care/src/main/resources/application.yml

@@ -135,7 +135,7 @@ wechat:
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
  wechat_base_url: http%3a%2f%2fweixin.xmtyw.cn%2fwlyy-dev
  accId: gh_ffd64560fb21
  id: sd_tnzyy_wx  # base库中,wx_wechat 的id字段
  id: ijk  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
im:
@@ -231,7 +231,7 @@ wechat:
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
  wechat_base_url: http%3a%2f%2fweixin.xmtyw.cn%2fwlyy-dev
  accId: gh_ffd64560fb21
  id: sd_tnzyy_wx  # base库中,wx_wechat 的id字段
  id: ijk  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
im:
@@ -335,7 +335,7 @@ wechat:
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
  wechat_base_url: http%3a%2f%2fweixin.xmtyw.cn%2fwlyy-dev
  accId: gh_ffd64560fb21
  id: sd_tnzyy_wx  # base库中,wx_wechat 的id字段
  id: ijk  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
im:

svr/svr-cloud-device/src/main/resources/application.yml

@@ -128,7 +128,7 @@ wechat:
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
  wechat_base_url: http%3a%2f%2fweixin.xmtyw.cn%2fwlyy-dev
  accId: gh_ffd64560fb21
  id: sd_tnzyy_wx  # base库中,wx_wechat 的id字段
  id: ijk  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
im:
@@ -221,7 +221,7 @@ wechat:
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
  wechat_base_url: http%3a%2f%2fweixin.xmtyw.cn%2fwlyy-dev
  accId: gh_ffd64560fb21
  id: sd_tnzyy_wx  # base库中,wx_wechat 的id字段
  id: ijk  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
im:
@@ -321,7 +321,7 @@ wechat:
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
  wechat_base_url: http%3a%2f%2fweixin.xmtyw.cn%2fwlyy-dev
  accId: gh_ffd64560fb21
  id: sd_tnzyy_wx  # base库中,wx_wechat 的id字段
  id: ijk  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
im: