Merge #93 into master from cc_20260413_fix
feat:ai店限制 * cc_20260413_fix: (2 commits squashed) - feat:加盟类费用完成 但是可乐机没有完成 设置标识 可乐机完成的时候查询如果有这个标识 更新阶段完成 - feat:ai店限制 Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com> Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com> CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/93
This commit is contained in:
@@ -41,6 +41,14 @@
|
||||
ORDER BY create_time DESC
|
||||
</select>
|
||||
|
||||
<select id="queryPageByShopIdAndExpenseType" resultMap="BaseResultMap">
|
||||
SELECT <include refid="Base_Column_List"/>
|
||||
FROM zxjp_pre_allocation_record
|
||||
WHERE shop_id = #{shopId}
|
||||
and expense_type = #{expenseType}
|
||||
ORDER BY create_time DESC
|
||||
</select>
|
||||
|
||||
<select id="queryPageByPayNo" resultMap="BaseResultMap">
|
||||
SELECT <include refid="Base_Column_List"/>
|
||||
FROM zxjp_pre_allocation_record
|
||||
|
||||
Reference in New Issue
Block a user