Skip to content

H
haoban-manage3.0
Commit bc29dccd by 墨竹
Options

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

parents 2b196895 bbd2eb54
Showing with 4 additions and 0 deletions
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/DictController.java
...@@ -52,8 +52,12 @@ public class DictController extends WebBaseController { ...@@ -52,8 +52,12 @@ public class DictController extends WebBaseController {
// 默认7 // 默认7
day = 7; day = 7;
} else { } else {
if (Objects.isNull(orderSetting.getData().getAfterSaleTime())) {
day = 7;
} else {
day = orderSetting.getData().getAfterSaleTime(); day = orderSetting.getData().getAfterSaleTime();
} }
}
DictDTO dictDTO = new DictDTO(); DictDTO dictDTO = new DictDTO();
dictDTO.setDictName("提现说明"); dictDTO.setDictName("提现说明");
dictDTO.setDictKey(orderAfterSaleTimeKey); dictDTO.setDictKey(orderAfterSaleTimeKey);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment