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

luliqiang

2020-08-27 c49b95fc3576f9a5dad5bcaa6874157d5091f6e0

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html

@@ -102,7 +102,7 @@
                    },
                    {
                        field: 'hospitalArea',
                        width: 250,
                        width: 200,
                        title: '所在地区',
                        templet: function (d) {
                            return ((d.hospitalProvince == null) ? "" : d.hospitalProvince) +
@@ -204,10 +204,10 @@
                //充值
                admin.putTempData("t_hospital", data);
                admin.popupCenter({
                    title: '医院充值',
                    title: '医院科室充值',
                    path: 'pages/opration/recharge.html',
                    area: '1200px',
                    offset: '10px',
                    offset: '0px',
                    finish: function () {
                        $('#hospita-btn-search').click();
                    }