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

侯瑞军

2020-04-02 0e2879d8e3110b777bcdcff9d7e8e8a44bf95e7d

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

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DataNeedMapper.xml

@@ -34,10 +34,10 @@
                and doctor_tel = #{p.doctorTel}
            </if>
            <if test="p.needBegintime != null and p.needBegintime !=''">
                and need_begintime = #{p.needBegintime}
                and need_begintime &gt;= #{p.needBegintime}
            </if>
            <if test="p.needEndtime != null and p.needEndtime !=''">
                and need_endtime = #{p.needEndtime}
                and need_endtime &lt;= #{p.needEndtime}
            </if>
            <if test="p.needTags != null and p.needTags !=''">
                and need_tags = #{p.needTags}

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/resources/application.yml

@@ -59,6 +59,7 @@
    ignoreTables:
      - sys_user
      - sys_logger
      - data_need
    ignoreSqls:
      - com.kidgrow.usercenter.mapper.SysRoleMapper.findAll