Merge branch 'develop' into feature/qt

2022-04-07 09:59:14 +08:00 · 2022-04-07 09:59:14 +08:00 · 0fd2ddf78c
parent 0faa5c5670 c1bcff5fb2
commit 0fd2ddf78c
1 changed files with 1 additions and 0 deletions
--- a/src/com/engine/salary/transmethod/ICategoryTransMethod.java
+++ b/src/com/engine/salary/transmethod/ICategoryTransMethod.java
@ -29,6 +29,7 @@ public class ICategoryTransMethod {
            case "2":
                return "个人";
            case "1,2":
+            case "2,1":
                return "公司,个人";
            default:
                return "";