Merge remote-tracking branch 'origin/dev_1.1.3' into dev_1.1.3

# Conflicts:
#	sop-api/install/mysql/upgrade/1.1.3.sql

sop-business/src/main/resources/db/log/caozixuan_update_log.sql

@@ -64,6 +64,3 @@ INSERT INTO sys_privilege (id, name, url, type, parent_id, sequence, property, r
 -- 2024-11-07
 ALTER TABLE t_b_ding_statistic_by_person
     ADD COLUMN user_id BIGINT NULL COMMENT '用户id' AFTER service_name;
-
-INSERT INTO sys_privilege (id, name, url, type, parent_id, sequence, property, enable, default_auth, front_display) VALUES ('2123', '工时统计-统计计算', '/api/admin/tb/ding/statistic/calculate', 'URL', '29', '4', 'AUTH', '1', '1', '0');
-INSERT INTO sys_privilege (id, name, url, type, parent_id, sequence, property, related, enable, default_auth, front_display) VALUES ('2124', '统计计算', 'Calculate', 'BUTTON', '29', '5', 'AUTH', '2123', '1', '0', '1');