Merge branch 'dev' into user_action

peng

2025-09-19 b7df7af3289cabe6cf8a23f314d803fc144a913e

 lmk-job/src/main/java/cn/lili/handler/impl/order/OrderEveryDayTaskExecute.java

@@ -89,7 +89,6 @@
     */
    @Override
    public void execute() {

        Setting setting = settingService.get(SettingEnum.ORDER_SETTING.name());
        //订单设置
        OrderSetting orderSetting = JSONUtil.toBean(setting.getSettingValue(), OrderSetting.class);