Merge branch 'master_after20' into master_cj_zq

 alter table base_data_customer modify column mnemonic_code varchar(100) null;
 
+ALTER TABLE sys_site_message
+    MODIFY receiver_id VARCHAR(100) DEFAULT NULL COMMENT '接收人';
+
 ALTER TABLE base_data_customer
     MODIFY COLUMN `code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '编号',
     MODIFY COLUMN `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '名称',
@@ -612,7 +615,7 @@ CREATE TABLE IF NOT EXISTS order_info_change_record (
     `workshop_id` varchar(50) DEFAULT NULL COMMENT '生产厂ID',
     `customer_credit_id` varchar(50) DEFAULT NULL COMMENT '客户资信ID',
     `total_quantity` double DEFAULT NULL COMMENT '总数量',
-    `packaging_fee` decimal(15,4) DEFAULT NULL COMMENT '包装费',
+    `packaging_fee` varchar(100) DEFAULT NULL COMMENT '包装费',
     `examine_status` varchar(50) DEFAULT NULL COMMENT '审核状态',
     `order_id` varchar(32) NOT NULL COMMENT '订货单ID',
     `output` bool DEFAULT NULL comment '已产出',

@@ -55,6 +55,7 @@ public class TransactorHandler {
             log.info("================== listTransactorsByRoleCode roleUserId:{}", id);
             List<String> userIds = userIdMap.get(id);
             log.info("================== listTransactorsByRoleCode userDeptUserId size:{}", CollectionUtils.isEmpty(userIds) ? 0 : userIds.size());
+            log.info("================== listTransactorsByRoleCode userIds:{}", userIds);
             if (CollectionUtils.isNotEmpty(userIds) && userIds.contains(userId)) {
                 result.add(id);
             }

@@ -68,7 +68,7 @@
                 AND tb.create_time >= #{vo.applicationDateStart}
             </if>
             <if test="vo.applicationDateEnd != null">
-                AND tb.create_time &lt;= #{vo.applicationDateEnd}
+                AND tb.create_time &lt;= CONCAT(DATE(#{vo.applicationDateEnd}), ' 23:59:59')
             </if>
             <if test="vo.searchKey != null and vo.searchKey != ''">
                 AND (tb.code LIKE CONCAT('%', #{vo.searchKey},'%') OR cu.name LIKE CONCAT('%', #{vo.searchKey},'%'))