Commit Graph

164 Commits (b5ba949b38f726bd137686eebe96e9db56b37308)

Author SHA1 Message Date
lisai17@sina.com 3a61b64cc1 Merge branch 'master' into ls-dev
# Conflicts:
#	ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java
#	ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java
2021-03-26 17:48:54 +08:00
xiaocui 8323695197 冻结退款金额 2021-03-26 09:27:47 +08:00
lisai17@sina.com 00b77bf063 . 2021-03-16 21:06:02 +08:00
lisai17@sina.com 62f32444a4 . 2021-03-16 14:47:37 +08:00
lisai17@sina.com e4cb4230a5 . 2021-03-16 14:28:46 +08:00
lisai17@sina.com 8dead8a5f4 . 2021-03-16 14:15:25 +08:00
lisai17@sina.com 8a6ad81935 . 2021-03-14 14:22:23 +08:00
lisai17@sina.com 81f60e05be 修复开票时的发票使用校验 2021-03-11 23:16:43 +08:00
lisai17@sina.com 4f1b5221a5 . 2021-03-06 15:32:54 +08:00
lisai17@sina.com d2df4c512e 修改结算管理bug,添加财务经理角色 2021-03-05 11:40:27 +08:00
lisai17@sina.com c7aa3b3bbe Merge branch 'master' into ls-dev 2021-03-05 11:30:51 +08:00
lisai17@sina.com 4ccc5f7243 . 2021-03-04 17:29:15 +08:00
lisai17@sina.com 554fc601fa . 2021-03-04 14:24:53 +08:00
lisai17@sina.com a04a5dc570 . 2021-03-03 16:46:13 +08:00
lisai17@sina.com 7a77fdc674 . 2021-03-03 11:40:27 +08:00
lisai17@sina.com 7703252729 调整短信 2021-03-03 09:01:47 +08:00
lisai17@sina.com afdfe0c0b8 添加结算管理功能 2021-03-01 17:31:02 +08:00
lisai17@sina.com f5504155bd . 2021-02-26 15:44:16 +08:00
lisai17@sina.com 9c8ca0d912 . 2021-02-01 22:56:27 +08:00
lisai17@sina.com 2193834913 . 2021-01-07 21:49:24 +08:00
lisai17@sina.com eff2a8aea4 . 2021-01-07 00:14:18 +08:00
lisai17@sina.com 3bcd5fa438 . 2020-12-30 10:33:05 +08:00
lisai17@sina.com a62ec3f74d . 2020-12-28 23:19:50 +08:00
lisai17@sina.com 80861ce523 . 2020-12-28 23:15:18 +08:00
lisai17@sina.com e11cb40d75 . 2020-12-28 22:58:18 +08:00
lisai17@sina.com 6cbdbaeaaa . 2020-12-26 15:52:20 +08:00
lisai17@sina.com a98c457150 . 2020-12-02 16:46:08 +08:00
lisai17@sina.com e09291e85c . 2020-12-02 16:45:39 +08:00
lisai17@sina.com aacaaae389 . 2020-12-02 16:26:15 +08:00
lisai17@sina.com fc02bb893a . 2020-12-02 10:49:06 +08:00
lisai17@sina.com 460b0b8395 . 2020-12-02 10:00:29 +08:00
lisai17@sina.com b554bb35b9 . 2020-12-01 21:54:28 +08:00
lisai17@sina.com 4cc2dba94a . 2020-12-01 21:19:53 +08:00
lisai17@sina.com a444158834 . 2020-12-01 21:16:33 +08:00
lisai17@sina.com d7b7127f55 . 2020-11-30 22:28:01 +08:00
lisai17@sina.com c7c18bd88e . 2020-11-23 22:44:58 +08:00
lisai17@sina.com 33dba4ef79 . 2020-11-20 20:45:57 +08:00
lisai17@sina.com d90a4dd80f 调整票据明细 2020-11-20 20:34:04 +08:00
lisai17@sina.com 18c3d12db6 2020-11-20 14:02:24 +08:00
lisai17@sina.com 42e57adaf9 添加砂站客户端状态显示 2020-11-19 16:42:14 +08:00
lisai17@sina.com 7f13f2cc11 . 2020-11-17 16:06:26 +08:00
lisai17@sina.com 0ce568d273 . 2020-11-17 09:19:49 +08:00
lisai17@sina.com 4fdefe5389 . 2020-11-15 21:30:25 +08:00
lisai17@sina.com 896398acb2 . 2020-11-15 00:03:45 +08:00
lisai17@sina.com cc88a428ec 添加异常数据检查、添加客户对账统计 2020-11-15 00:03:11 +08:00
lisai17@sina.com a8a54ac2b8 . 2020-11-11 11:54:15 +08:00
lisai17@sina.com 826ea29b46 . 2020-11-09 21:30:26 +08:00
lisai17@sina.com 9f92675ba1 . 2020-11-09 09:46:13 +08:00
lisai17@sina.com aa867f3191 . 2020-11-09 09:40:15 +08:00
lisai17@sina.com 7ed2bc5d22 . 2020-11-06 11:02:09 +08:00