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

# Conflicts:
#	business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

common/common-entity/src/main/java/com/yihu/jw/entity/IntegerIdentityEntity.java

@@ -19,13 +19,13 @@ public abstract class IntegerIdentityEntity implements Serializable {
    @Id
//==========mysql 环境 id策略======================================================
  /*  @GeneratedValue(generator = "generator")
    @GeneratedValue(generator = "generator")
    @GenericGenerator(name = "generator", strategy = "identity")
    @Column(name = "id", unique = true, nullable = false)*/
    @Column(name = "id", unique = true, nullable = false)
//==========mysql 环境 id策略 end======================================================
//==========Oracle 环境id策略 =========================================================
    @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="id_generated")
/*    @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="id_generated")*/
//==========Oracle 环境id策略 =========================================================
    public Integer getId() {
        return id;

gateway/ag-basic/src/main/resources/bootstrap.yml

@@ -52,7 +52,7 @@ spring:
  profiles: jwprod
  cloud:
    config:
      uri: ${wlyy.pring.config.uri:http://192.0.33.26:1221}
      uri: ${wlyy.pring.config.uri:http://172.16.1.42:1221}
      label: ${wlyy.spring.config.label:master}
---
spring:

server/svr-authentication/src/main/resources/bootstrap.yml

@@ -47,7 +47,7 @@ spring:
  profiles: jwprod
  cloud:
    config:
      uri: ${wlyy.spring.config.uri:http://192.0.33.26:1221}
      uri: ${wlyy.spring.config.uri:http://172.16.1.42:1221}
      label: ${wlyy.spring.config.label:master}
---
spring:

server/svr-configuration/src/main/resources/bootstrap.yml

@@ -59,7 +59,7 @@ spring:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://192.0.33.26:3000/jkzl/wlyy2.0.config.git}
          uri: ${wlyy.spring.config.git.uri:http://172.16.1.42:3001/jkzl/wlyy2.0.config.git}
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:master}

svr/svr-base/src/main/resources/bootstrap.yml

@@ -34,7 +34,7 @@ spring:
  profiles: jwprod
  cloud:
    config:
      uri: ${wlyy.spring.config.uri:http://192.0.33.26:1221}
      uri: ${wlyy.spring.config.uri:http://172.16.1.42:1221}
      label: ${wlyy.spring.config.label:master}
---
spring:

svr/svr-internet-hospital-entrance/src/main/resources/bootstrap.yml

@@ -28,7 +28,7 @@ spring:
  profiles: jwprod
  cloud:
    config:
      uri: ${wlyy.spring.config.uri:http://192.0.33.26:1221}
      uri: ${wlyy.spring.config.uri:http://172.16.1.42:1221}
      label: ${wlyy.spring.config.label:master}
---

svr/svr-internet-hospital-job/src/main/resources/bootstrap.yml

@@ -41,7 +41,7 @@ spring:
  profiles: jwprod
  cloud:
    config:
      uri: ${wlyy.spring.config.uri:http://192.0.33.26:1221}
      uri: ${wlyy.spring.config.uri:http://172.16.1.42:1221}
      label: ${wlyy.spring.config.label:master}
---

svr/svr-internet-hospital/src/main/resources/bootstrap.yml

@@ -35,7 +35,7 @@ spring:
  profiles: jwprod
  cloud:
    config:
      uri: ${wlyy.spring.config.uri:http://192.0.33.26:1221}
      uri: ${wlyy.spring.config.uri:http://172.16.1.42:1221}
      label: ${wlyy.spring.config.label:master}
---

svr/svr-iot/src/main/resources/bootstrap.yml

@@ -44,7 +44,7 @@ spring:
  profiles: jwprod
  cloud:
    config:
      uri: ${wlyy.spring.config.uri:http://192.0.33.26:1221}
      uri: ${wlyy.spring.config.uri:http://172.16.1.42:1221}
      label: ${wlyy.spring.config.label:master}
---