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

src/main/resources/mapper/ledger/WfSubscriptionMapper.xml

@@ -8,7 +8,7 @@
         inner join xjr_workflow_form_relation t4 ON t1.id = t4.form_key_value
         left join xjr_department t2 on t1.application_department = t2.id
         left join xjr_user t3 on t1.user_id = t3.id
-        where t4.current_state = 'COMPLETED';
+        where t4.current_state = 'COMPLETED'
         <if test="dto.orgId != null">
             and t2.id = #{dto.orgId}
         </if>