Merge branch 'dev' into 'feature_member_score'

# Conflicts:
#   yudao-module-reward/yudao-module-reward-api/pom.xml
#   yudao-module-reward/yudao-module-reward-impl/pom.xml
#   yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/controller/admin/config/SwaggerRewardConfiguration.java

sql/update_2024-07.sql

@@ -53,6 +53,12 @@ CREATE TABLE `ecw_vz` (
 ) ENGINE=InnoDB ROW_FORMAT=DYNAMIC COMMENT='计量单位表';
 
 
+alter table `ecw_target_log`
+    add column `loglev` int DEFAULT NULL COMMENT '逻辑计算来源';
+alter table `ecw_target_log`
+    add column `gsf` varchar(800) COLLATE utf8mb4_general_ci DEFAULT NULL;
+alter table `ecw_target_log`
+    add column `gstype` int DEFAULT NULL;
 
 -- 新增订单产生业绩时归属客户状态