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

hx-sale/src/main/resources/mapper/contract/ContractMapper.xml

@@ -60,10 +60,9 @@
                 buy_corporation_id = #{customerId}
             </if>
         </where>
-            ) t1
+        ) t1
         WHERE t1.sumPackQuantity &lt; t1.cpQuantity
-        AND t1.`status` &gt;=30
-        AND t1.`status` &lt;99
+        AND t1.`status`=30
         GROUP BY t1.id
     </select>