Merge remote-tracking branch 'origin/dev_New' into dev_New

云

2026-04-17 ac11e0a1320b469a2a111ba3d6a4a54f424845b7

 src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml

@@ -84,8 +84,7 @@
            </if>

        </where>
        GROUP BY slpa.scheduling_user_name

        GROUP BY slpa.scheduling_user_id, slpa.scheduling_user_name
    </select>

    <select id="selectDailyWagesStats" resultType="java.util.Map">