Merge branch 'second'

This commit is contained in:
zhl 2021-02-05 18:08:23 +08:00
commit 3a3d79b5d7
2 changed files with 2 additions and 2 deletions

View File

@ -1 +1 @@
[{"id":90001,"income_premiseID":1,"income":"80029:1","repeat":0,"frequency":0,"interval":0},{"id":90002,"income_premiseID":2,"income":"80030:1","repeat":0,"frequency":0,"interval":0},{"id":90003,"income_premiseID":3,"income":"80031:1","repeat":1,"frequency":10,"interval":30},{"id":90004,"income_premiseID":3,"income":"80031:1","repeat":1,"frequency":1,"interval":0},{"id":90005,"income_premiseID":3,"income":"80033:1","repeat":1,"frequency":10,"interval":30},{"id":90006,"income_premiseID":3,"income":"80034:1","repeat":1,"frequency":10,"interval":30},{"id":90007,"income_premiseID":3,"income":"80033:1","repeat":1,"frequency":1,"interval":0},{"id":90008,"income_premiseID":3,"income":"80034:1","repeat":1,"frequency":1,"interval":0}]
[{"id":90001,"income_premiseID":1,"income":"80029:1:1","repeat":0,"frequency":0,"interval":0},{"id":90002,"income_premiseID":2,"income":"80030:1:1","repeat":0,"frequency":0,"interval":0},{"id":90003,"income_premiseID":3,"income":"80031:2:1|80031:1:2","repeat":1,"frequency":10,"interval":30},{"id":90005,"income_premiseID":3,"income":"80033:2:1|80033:1:2","repeat":1,"frequency":10,"interval":30},{"id":90006,"income_premiseID":3,"income":"80034:2:1|80034:1:2","repeat":1,"frequency":10,"interval":30}]

File diff suppressed because one or more lines are too long