Merge branch 'master' into dev

This commit is contained in:
jishenghua 2025-03-25 11:47:02 +08:00
commit 798664dbf8

View File

@ -1043,7 +1043,8 @@
</if> </if>
and m.enable_batch_number =1 and m.enable_batch_number =1
and di.delete_flag!=1) tb and di.delete_flag!=1) tb
group by batch_number group by id, bar_code, name, standard, model, unit_id,
commodity_unit, batch_number, expiration_date
order by expiration_date asc order by expiration_date asc
</select> </select>