Merge remote-tracking branch 'origin/beta-prop-all' into beta-prop-all

jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java

@@ -529,10 +529,7 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
         } else if (StringUtils.equals(ddzt, "031999")) {
             invoice.setState(22); // "开票状态"
         } else if (StringUtils.equals(ddzt, "032000")) {
-//            invoice.setState(20); // "开票状态"
+            invoice.setState(20); // "开票状态"
-            invoice.setState(21); // "开票状态"
-
-
         } else if (StringUtils.equals(ddzt, "003000")) {
             invoice.setState(3); // "开票状态"
         } else if (StringUtils.equals(ddzt, "004000")) {