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

common/common-entity/sql记录.txt

@@ -1687,3 +1687,15 @@ alter table t_mediicine_order add column reviewer_doctor_name varchar(255) defau
 alter table t_mediicine_device_print_message add column  fee_remark varchar(500) DEFAULT NULL COMMENT '结算备注';
 alter table base_ylz_medical_relation add column equ_num varchar(100) DEFAULT NULL COMMENT '设备号';
 --2025-01-10
 ALTER TABLE `base`.`advertisement_putting_admin`
 ADD COLUMN `publish_location` int(11) NULL COMMENT '发布位置（0广告位、1banner位、2动态列表）' AFTER `title`,
 ADD COLUMN `sort` int(11) NULL COMMENT '排序' AFTER `forbidden`;
 ALTER TABLE `base`.`advertisement_putting_admin`
 ADD COLUMN `content` varchar(255) NULL COMMENT '内容' AFTER `forbidden`,
 ADD COLUMN `link_url` varchar(255) NULL COMMENT '链接网址' AFTER `content`;
 ALTER TABLE `base`.`advertisement_putting_admin`
 ADD COLUMN `launch_device` int(11) NULL COMMENT '投放设备（0部分设备，1所有设备）' AFTER `category_name`;

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineOrderEndpoint.java

@@ -341,6 +341,7 @@ public class MedicineOrderEndpoint extends EnvelopRestEndpoint {
                addCell(sheet, j, 7, DateUtil.dateToStrLong(tmp.getPrescribeTime()));
                addCell(sheet, j, 8, DateUtil.dateToStrLong(tmp.getPayTime()));
                addCell(sheet, j, 9, tmp.getOrderType());
                addCell(sheet, j, 9, tmp.getOrderSource());
                addCell(sheet, j, 10, tmp.getInfoAccess());
                j++;
                ii++;