Commit 0ac104c3 by wuwenlong

Merge branch 'dev'

parents 930a5787 134e5ec2
......@@ -301,7 +301,6 @@
AND STATUS = 1
<include refid="condition"/>
<include refid="customCondition"/>
ORDER BY ID
</select>
<!-- 存货档案部件下拉框 -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment